diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-17 08:37:52 -0400 |
---|---|---|
committer | Haojian Zhuang <hzhuang1@hexinfolabs.org> | 2011-11-15 06:08:27 -0500 |
commit | 157d2644cb0c1e71a18baaffca56d2b1d0ebf10f (patch) | |
tree | e33d224362ce8ac0706725f02ecd8b89c3645934 /arch/arm/mach-pxa/pxa27x.c | |
parent | 9bf448c66d4b4cb03813b39195d408701ecf1fab (diff) |
ARM: pxa: change gpio to platform device
Remove most gpio macros and change gpio driver to platform driver.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 44563a0997bd..aed6cbcf3866 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -12,6 +12,7 @@ | |||
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
15 | #include <linux/gpio-pxa.h> | ||
15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
@@ -386,7 +387,6 @@ static int pxa27x_set_wake(struct irq_data *d, unsigned int on) | |||
386 | void __init pxa27x_init_irq(void) | 387 | void __init pxa27x_init_irq(void) |
387 | { | 388 | { |
388 | pxa_init_irq(34, pxa27x_set_wake); | 389 | pxa_init_irq(34, pxa27x_set_wake); |
389 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 120, pxa27x_set_wake); | ||
390 | } | 390 | } |
391 | 391 | ||
392 | static struct map_desc pxa27x_io_desc[] __initdata = { | 392 | static struct map_desc pxa27x_io_desc[] __initdata = { |
@@ -422,6 +422,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) | |||
422 | } | 422 | } |
423 | 423 | ||
424 | static struct platform_device *devices[] __initdata = { | 424 | static struct platform_device *devices[] __initdata = { |
425 | &pxa_device_gpio, | ||
425 | &pxa27x_device_udc, | 426 | &pxa27x_device_udc, |
426 | &pxa_device_pmu, | 427 | &pxa_device_pmu, |
427 | &pxa_device_i2s, | 428 | &pxa_device_i2s, |