Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
1a6a3589
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1a6a3589
编写于
2月 22, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-arm
上级
245599f5
06e4479b
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
149 addition
and
63 deletion
+149
-63
arch/arm/common/rtctime.c
arch/arm/common/rtctime.c
+12
-4
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-armv.S
+1
-1
arch/arm/kernel/traps.c
arch/arm/kernel/traps.c
+8
-0
arch/arm/mach-at91rm9200/devices.c
arch/arm/mach-at91rm9200/devices.c
+3
-1
arch/arm/mach-at91rm9200/gpio.c
arch/arm/mach-at91rm9200/gpio.c
+17
-0
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/common.c
+13
-7
arch/arm/mach-ixp4xx/nslu2-power.c
arch/arm/mach-ixp4xx/nslu2-power.c
+3
-0
arch/arm/mach-ixp4xx/nslu2-setup.c
arch/arm/mach-ixp4xx/nslu2-setup.c
+7
-0
arch/arm/mach-versatile/pci.c
arch/arm/mach-versatile/pci.c
+48
-45
arch/arm/mm/abort-ev6.S
arch/arm/mm/abort-ev6.S
+1
-1
arch/arm/tools/mach-types
arch/arm/tools/mach-types
+33
-2
include/asm-arm/arch-at91rm9200/gpio.h
include/asm-arm/arch-at91rm9200/gpio.h
+1
-0
include/asm-arm/arch-ixp4xx/nas100d.h
include/asm-arm/arch-ixp4xx/nas100d.h
+2
-2
未找到文件。
arch/arm/common/rtctime.c
浏览文件 @
1a6a3589
...
...
@@ -128,19 +128,27 @@ EXPORT_SYMBOL(rtc_tm_to_time);
/*
* Calculate the next alarm time given the requested alarm time mask
* and the current time.
*
* FIXME: for now, we just copy the alarm time because we're lazy (and
* is therefore buggy - setting a 10am alarm at 8pm will not result in
* the alarm triggering.)
*/
void
rtc_next_alarm_time
(
struct
rtc_time
*
next
,
struct
rtc_time
*
now
,
struct
rtc_time
*
alrm
)
{
unsigned
long
next_time
;
unsigned
long
now_time
;
next
->
tm_year
=
now
->
tm_year
;
next
->
tm_mon
=
now
->
tm_mon
;
next
->
tm_mday
=
now
->
tm_mday
;
next
->
tm_hour
=
alrm
->
tm_hour
;
next
->
tm_min
=
alrm
->
tm_min
;
next
->
tm_sec
=
alrm
->
tm_sec
;
rtc_tm_to_time
(
now
,
&
now_time
);
rtc_tm_to_time
(
next
,
&
next_time
);
if
(
next_time
<
now_time
)
{
/* Advance one day */
next_time
+=
60
*
60
*
24
;
rtc_time_to_tm
(
next_time
,
next
);
}
}
static
inline
int
rtc_read_time
(
struct
rtc_ops
*
ops
,
struct
rtc_time
*
tm
)
...
...
arch/arm/kernel/entry-armv.S
浏览文件 @
1a6a3589
...
...
@@ -566,7 +566,7 @@ ENTRY(__switch_to)
ldr
r6
,
[
r2
,
#
TI_CPU_DOMAIN
]!
#endif
#if __LINUX_ARM_ARCH__ >= 6
#ifdef CONFIG_CPU_
MPCORE
#ifdef CONFIG_CPU_
32v6K
clrex
#else
strex
r5
,
r4
,
[
ip
]
@
Clear
exclusive
monitor
...
...
arch/arm/kernel/traps.c
浏览文件 @
1a6a3589
...
...
@@ -19,6 +19,7 @@
#include <linux/personality.h>
#include <linux/ptrace.h>
#include <linux/kallsyms.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <asm/atomic.h>
...
...
@@ -231,6 +232,13 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
__die
(
str
,
err
,
thread
,
regs
);
bust_spinlocks
(
0
);
spin_unlock_irq
(
&
die_lock
);
if
(
panic_on_oops
)
{
printk
(
KERN_EMERG
"Fatal exception: panic in 5 seconds
\n
"
);
ssleep
(
5
);
panic
(
"Fatal exception"
);
}
do_exit
(
SIGSEGV
);
}
...
...
arch/arm/mach-at91rm9200/devices.c
浏览文件 @
1a6a3589
...
...
@@ -100,8 +100,10 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
at91_set_gpio_input
(
data
->
vbus_pin
,
0
);
at91_set_deglitch
(
data
->
vbus_pin
,
1
);
}
if
(
data
->
pullup_pin
)
if
(
data
->
pullup_pin
)
{
at91_set_gpio_output
(
data
->
pullup_pin
,
0
);
at91_set_multi_drive
(
data
->
pullup_pin
,
1
);
}
udc_data
=
*
data
;
platform_device_register
(
&
at91rm9200_udc_device
);
...
...
arch/arm/mach-at91rm9200/gpio.c
浏览文件 @
1a6a3589
...
...
@@ -159,6 +159,23 @@ int __init_or_module at91_set_deglitch(unsigned pin, int is_on)
}
EXPORT_SYMBOL
(
at91_set_deglitch
);
/*
* enable/disable the multi-driver; This is only valid for output and
* allows the output pin to run as an open collector output.
*/
int
__init_or_module
at91_set_multi_drive
(
unsigned
pin
,
int
is_on
)
{
void
__iomem
*
pio
=
pin_to_controller
(
pin
);
unsigned
mask
=
pin_to_mask
(
pin
);
if
(
!
pio
)
return
-
EINVAL
;
__raw_writel
(
mask
,
pio
+
(
is_on
?
PIO_MDER
:
PIO_MDDR
));
return
0
;
}
EXPORT_SYMBOL
(
at91_set_multi_drive
);
/*--------------------------------------------------------------------------*/
...
...
arch/arm/mach-ixp4xx/common.c
浏览文件 @
1a6a3589
...
...
@@ -111,24 +111,30 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
if
(
line
<
0
)
return
-
EINVAL
;
if
(
type
&
IRQT_BOTHEDGE
)
{
switch
(
type
){
case
IRQT_BOTHEDGE
:
int_style
=
IXP4XX_GPIO_STYLE_TRANSITIONAL
;
irq_type
=
IXP4XX_IRQ_EDGE
;
}
else
if
(
type
&
IRQT_RISING
)
{
break
;
case
IRQT_RISING
:
int_style
=
IXP4XX_GPIO_STYLE_RISING_EDGE
;
irq_type
=
IXP4XX_IRQ_EDGE
;
}
else
if
(
type
&
IRQT_FALLING
)
{
break
;
case
IRQT_FALLING
:
int_style
=
IXP4XX_GPIO_STYLE_FALLING_EDGE
;
irq_type
=
IXP4XX_IRQ_EDGE
;
}
else
if
(
type
&
IRQT_HIGH
)
{
break
;
case
IRQT_HIGH
:
int_style
=
IXP4XX_GPIO_STYLE_ACTIVE_HIGH
;
irq_type
=
IXP4XX_IRQ_LEVEL
;
}
else
if
(
type
&
IRQT_LOW
)
{
break
;
case
IRQT_LOW
:
int_style
=
IXP4XX_GPIO_STYLE_ACTIVE_LOW
;
irq_type
=
IXP4XX_IRQ_LEVEL
;
}
else
break
;
default:
return
-
EINVAL
;
}
ixp4xx_config_irq
(
irq
,
irq_type
);
if
(
line
>=
8
)
{
/* pins 8-15 */
...
...
arch/arm/mach-ixp4xx/nslu2-power.c
浏览文件 @
1a6a3589
...
...
@@ -77,6 +77,9 @@ static int __init nslu2_power_init(void)
static
void
__exit
nslu2_power_exit
(
void
)
{
if
(
!
(
machine_is_nslu2
()))
return
;
free_irq
(
NSLU2_RB_IRQ
,
NULL
);
free_irq
(
NSLU2_PB_IRQ
,
NULL
);
}
...
...
arch/arm/mach-ixp4xx/nslu2-setup.c
浏览文件 @
1a6a3589
...
...
@@ -50,6 +50,12 @@ static struct platform_device nslu2_i2c_controller = {
.
num_resources
=
0
,
};
static
struct
platform_device
nslu2_beeper
=
{
.
name
=
"ixp4xx-beeper"
,
.
id
=
NSLU2_GPIO_BUZZ
,
.
num_resources
=
0
,
};
static
struct
resource
nslu2_uart_resources
[]
=
{
{
.
start
=
IXP4XX_UART1_BASE_PHYS
,
...
...
@@ -97,6 +103,7 @@ static struct platform_device *nslu2_devices[] __initdata = {
&
nslu2_i2c_controller
,
&
nslu2_flash
,
&
nslu2_uart
,
&
nslu2_beeper
,
};
static
void
nslu2_power_off
(
void
)
...
...
arch/arm/mach-versatile/pci.c
浏览文件 @
1a6a3589
...
...
@@ -240,6 +240,14 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
int
i
;
int
myslot
=
-
1
;
unsigned
long
val
;
void
__iomem
*
local_pci_cfg_base
;
val
=
__raw_readl
(
SYS_PCICTL
);
if
(
!
(
val
&
1
))
{
printk
(
"Not plugged into PCI backplane!
\n
"
);
ret
=
-
EIO
;
goto
out
;
}
if
(
nr
==
0
)
{
sys
->
mem_offset
=
0
;
...
...
@@ -253,47 +261,44 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
goto
out
;
}
__raw_writel
(
VERSATILE_PCI_MEM_BASE0
>>
28
,
PCI_IMAP0
);
__raw_writel
(
VERSATILE_PCI_MEM_BASE1
>>
28
,
PCI_IMAP1
);
__raw_writel
(
VERSATILE_PCI_MEM_BASE2
>>
28
,
PCI_IMAP2
);
__raw_writel
(
1
,
SYS_PCICTL
);
val
=
__raw_readl
(
SYS_PCICTL
);
if
(
!
(
val
&
1
))
{
printk
(
"Not plugged into PCI backplane!
\n
"
);
ret
=
-
EIO
;
goto
out
;
}
/*
* We need to discover the PCI core first to configure itself
* before the main PCI probing is performed
*/
for
(
i
=
0
;
i
<
32
;
i
++
)
{
for
(
i
=
0
;
i
<
32
;
i
++
)
if
((
__raw_readl
(
VERSATILE_PCI_VIRT_BASE
+
(
i
<<
11
)
+
DEVICE_ID_OFFSET
)
==
VP_PCI_DEVICE_ID
)
&&
(
__raw_readl
(
VERSATILE_PCI_VIRT_BASE
+
(
i
<<
11
)
+
CLASS_ID_OFFSET
)
==
VP_PCI_CLASS_ID
))
{
myslot
=
i
;
__raw_writel
(
myslot
,
PCI_SELFID
);
val
=
__raw_readl
(
VERSATILE_PCI_CFG_VIRT_BASE
+
(
myslot
<<
11
)
+
CSR_OFFSET
);
val
|=
(
1
<<
2
);
__raw_writel
(
val
,
VERSATILE_PCI_CFG_VIRT_BASE
+
(
myslot
<<
11
)
+
CSR_OFFSET
);
break
;
}
}
if
(
myslot
==
-
1
)
{
printk
(
"Cannot find PCI core!
\n
"
);
ret
=
-
EIO
;
}
else
{
goto
out
;
}
printk
(
"PCI core found (slot %d)
\n
"
,
myslot
);
/* Do not to map Versatile FPGA PCI device
into memory space as we are short of
mappable memory */
__raw_writel
(
myslot
,
PCI_SELFID
);
local_pci_cfg_base
=
(
void
*
)
VERSATILE_PCI_CFG_VIRT_BASE
+
(
myslot
<<
11
);
val
=
__raw_readl
(
local_pci_cfg_base
+
CSR_OFFSET
);
val
|=
PCI_COMMAND_MEMORY
|
PCI_COMMAND_MASTER
|
PCI_COMMAND_INVALIDATE
;
__raw_writel
(
val
,
local_pci_cfg_base
+
CSR_OFFSET
);
/*
* Configure the PCI inbound memory windows to be 1:1 mapped to SDRAM
*/
__raw_writel
(
PHYS_OFFSET
,
local_pci_cfg_base
+
PCI_BASE_ADDRESS_0
);
__raw_writel
(
PHYS_OFFSET
,
local_pci_cfg_base
+
PCI_BASE_ADDRESS_1
);
__raw_writel
(
PHYS_OFFSET
,
local_pci_cfg_base
+
PCI_BASE_ADDRESS_2
);
/*
* Do not to map Versatile FPGA PCI device into memory space
*/
pci_slot_ignore
|=
(
1
<<
myslot
);
ret
=
1
;
}
out:
return
ret
;
...
...
@@ -305,18 +310,18 @@ struct pci_bus *pci_versatile_scan_bus(int nr, struct pci_sys_data *sys)
return
pci_scan_bus
(
sys
->
busnr
,
&
pci_versatile_ops
,
sys
);
}
/*
* V3_LB_BASE? - local bus address
* V3_LB_MAP? - pci bus address
*/
void
__init
pci_versatile_preinit
(
void
)
{
}
__raw_writel
(
VERSATILE_PCI_MEM_BASE0
>>
28
,
PCI_IMAP0
);
__raw_writel
(
VERSATILE_PCI_MEM_BASE1
>>
28
,
PCI_IMAP1
);
__raw_writel
(
VERSATILE_PCI_MEM_BASE2
>>
28
,
PCI_IMAP2
);
void
__init
pci_versatile_postinit
(
void
)
{
}
__raw_writel
(
PHYS_OFFSET
>>
28
,
PCI_SMAP0
);
__raw_writel
(
PHYS_OFFSET
>>
28
,
PCI_SMAP1
);
__raw_writel
(
PHYS_OFFSET
>>
28
,
PCI_SMAP2
);
__raw_writel
(
1
,
SYS_PCICTL
);
}
/*
* map the specified device/slot/pin to an IRQ. Different backplanes may need to modify this.
...
...
@@ -327,15 +332,14 @@ static int __init versatile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
int
devslot
=
PCI_SLOT
(
dev
->
devfn
);
/* slot, pin, irq
24 1
27
25 1 28 untested
26 1
29
27 1 30 untested
* 24 1
27
* 25 1 28
* 26 1
29
* 27 1 30
*/
irq
=
27
+
((
slot
+
pin
-
1
)
&
3
);
irq
=
27
+
((
slot
+
pin
+
2
)
%
3
);
/* Fudged */
printk
(
"map irq: slot %d, pin %d, devslot %d, irq: %d
\n
"
,
slot
,
pin
,
devslot
,
irq
);
printk
(
"PCI map irq: slot %d, pin %d, devslot %d, irq: %d
\n
"
,
slot
,
pin
,
devslot
,
irq
);
return
irq
;
}
...
...
@@ -347,7 +351,6 @@ static struct hw_pci versatile_pci __initdata = {
.
setup
=
pci_versatile_setup
,
.
scan
=
pci_versatile_scan_bus
,
.
preinit
=
pci_versatile_preinit
,
.
postinit
=
pci_versatile_postinit
,
};
static
int
__init
versatile_pci_init
(
void
)
...
...
arch/arm/mm/abort-ev6.S
浏览文件 @
1a6a3589
...
...
@@ -20,7 +20,7 @@
*/
.
align
5
ENTRY
(
v6_early_abort
)
#ifdef CONFIG_CPU_
MPCORE
#ifdef CONFIG_CPU_
32v6K
clrex
#else
strex
r0
,
r1
,
[
sp
]
@
Clear
the
exclusive
monitor
...
...
arch/arm/tools/mach-types
浏览文件 @
1a6a3589
...
...
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
#
# Last update: Mon
Jan 9 12:56:4
2 2006
# Last update: Mon
Feb 20 10:18:0
2 2006
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
...
...
@@ -904,7 +904,7 @@ wg302v2 MACH_WG302V2 WG302V2 890
eb42x MACH_EB42X EB42X 891
iq331es MACH_IQ331ES IQ331ES 892
cosydsp MACH_COSYDSP COSYDSP 893
uplat7d
MACH_UPLAT7D UPLAT7D 894
uplat7d
_proto
MACH_UPLAT7D UPLAT7D 894
ptdavinci MACH_PTDAVINCI PTDAVINCI 895
mbus MACH_MBUS MBUS 896
nadia2vb MACH_NADIA2VB NADIA2VB 897
...
...
@@ -938,3 +938,34 @@ auckland MACH_AUCKLAND AUCKLAND 924
ak3220m MACH_AK3320M AK3320M 925
duramax MACH_DURAMAX DURAMAX 926
n35 MACH_N35 N35 927
pronghorn MACH_PRONGHORN PRONGHORN 928
fundy MACH_FUNDY FUNDY 929
logicpd_pxa270 MACH_LOGICPD_PXA270 LOGICPD_PXA270 930
cpu777 MACH_CPU777 CPU777 931
simicon9201 MACH_SIMICON9201 SIMICON9201 932
leap2_hpm MACH_LEAP2_HPM LEAP2_HPM 933
cm922txa10 MACH_CM922TXA10 CM922TXA10 934
sandgate MACH_PXA PXA 935
sandgate2 MACH_SANDGATE2 SANDGATE2 936
sandgate2g MACH_SANDGATE2G SANDGATE2G 937
sandgate2p MACH_SANDGATE2P SANDGATE2P 938
fred_jack MACH_FRED_JACK FRED_JACK 939
ttg_color1 MACH_TTG_COLOR1 TTG_COLOR1 940
nxeb500hmi MACH_NXEB500HMI NXEB500HMI 941
netdcu8 MACH_NETDCU8 NETDCU8 942
ml675050_cpu_boa MACH_ML675050_CPU_BOA ML675050_CPU_BOA 943
ng_fvx538 MACH_NG_FVX538 NG_FVX538 944
ng_fvs338 MACH_NG_FVS338 NG_FVS338 945
pnx4103 MACH_PNX4103 PNX4103 946
hesdb MACH_HESDB HESDB 947
xsilo MACH_XSILO XSILO 948
espresso MACH_ESPRESSO ESPRESSO 949
emlc MACH_EMLC EMLC 950
sisteron MACH_SISTERON SISTERON 951
rx1950 MACH_RX1950 RX1950 952
tsc_venus MACH_TSC_VENUS TSC_VENUS 953
ds101j MACH_DS101J DS101J 954
mxc300_30ads MACH_MXC30030ADS MXC30030ADS 955
fujitsu_wimaxsoc MACH_FUJITSU_WIMAXSOC FUJITSU_WIMAXSOC 956
dualpcmodem MACH_DUALPCMODEM DUALPCMODEM 957
gesbc9312 MACH_GESBC9312 GESBC9312 958
include/asm-arm/arch-at91rm9200/gpio.h
浏览文件 @
1a6a3589
...
...
@@ -183,6 +183,7 @@ extern int at91_set_B_periph(unsigned pin, int use_pullup);
extern
int
at91_set_gpio_input
(
unsigned
pin
,
int
use_pullup
);
extern
int
at91_set_gpio_output
(
unsigned
pin
,
int
value
);
extern
int
at91_set_deglitch
(
unsigned
pin
,
int
is_on
);
extern
int
at91_set_multi_drive
(
unsigned
pin
,
int
is_on
);
/* callable at any time */
extern
int
at91_set_gpio_value
(
unsigned
pin
,
int
value
);
...
...
include/asm-arm/arch-ixp4xx/nas100d.h
浏览文件 @
1a6a3589
...
...
@@ -19,8 +19,8 @@
#error "Do not include this directly, instead #include <asm/hardware.h>"
#endif
#define NAS100D_SDA_PIN
6
#define NAS100D_SCL_PIN
5
#define NAS100D_SDA_PIN
5
#define NAS100D_SCL_PIN
6
/*
* NAS100D PCI IRQs
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录