diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 16:15:00 -0700 |
commit | 39b945a37bac2b692773a470890c8ba301485b15 (patch) | |
tree | fe599a2cb77afa5dcfc3c07ef7f23933ea723f2e /arch | |
parent | 203c80187eba037f2d6562e0d5847014746726dd (diff) | |
parent | 0ef2cfc0ca4625424e5b8ead6c47359c35a7a841 (diff) | |
download | kernel_samsung_smdk4412-39b945a37bac2b692773a470890c8ba301485b15.zip kernel_samsung_smdk4412-39b945a37bac2b692773a470890c8ba301485b15.tar.gz kernel_samsung_smdk4412-39b945a37bac2b692773a470890c8ba301485b15.tar.bz2 |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: fix tosa.c build error
[ARM] 5067/1: _raw_write_can_lock macro bugfix
[ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
[ARM] 5068/1: PXA2xx Additional gpio definitions
[ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
[ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
[ARM] 5060/1: remove unnecessary include of asm/io.h
[ARM] fix AT91 include loops
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/compressed/head-xscale.S | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/cm-x270.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index 67ea99e..dd3fbd6 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S @@ -33,10 +33,6 @@ __XScale_start: bic r0, r0, #0x1000 @ clear Icache mcr p15, 0, r0, c1, c0, 0 -#ifdef CONFIG_ARCH_COTULLA_IDP - mov r7, #MACH_TYPE_COTULLA_IDP -#endif - #ifdef CONFIG_ARCH_IXP2000 mov r1, #-1 mov r0, #0xd6000000 diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c index 6d4416a..f5851d1 100644 --- a/arch/arm/mach-pxa/cm-x270.c +++ b/arch/arm/mach-pxa/cm-x270.c @@ -59,7 +59,7 @@ static struct resource cmx270_dm9k_resource[] = { [2] = { .start = CMX270_ETHIRQ, .end = CMX270_ETHIRQ, - .flags = IORESOURCE_IRQ, + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, } }; diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index edc4f07..9c57700 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -50,7 +50,7 @@ static struct resource em_x270_dm9k_resource[] = { [2] = { .start = EM_X270_ETHIRQ, .end = EM_X270_ETHIRQ, - .flags = IORESOURCE_IRQ, + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, } }; diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index c2cbd66..ab4a9f5 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -467,8 +467,8 @@ static struct platform_device *devices[] __initdata = { static void tosa_poweroff(void) { - pxa_gpio_mode(TOSA_GPIO_ON_RESET | GPIO_OUT); - GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); + gpio_direction_output(TOSA_GPIO_ON_RESET, 0); + gpio_set_value(TOSA_GPIO_ON_RESET, 1); mdelay(1000); arm_machine_restart('h'); |