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/pxa25x.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/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 0f38cfce5c35..91e4f6c03766 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -17,6 +17,7 @@ | |||
17 | * need be. | 17 | * need be. |
18 | */ | 18 | */ |
19 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
20 | #include <linux/gpio-pxa.h> | ||
20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
@@ -312,14 +313,12 @@ set_pwer: | |||
312 | void __init pxa25x_init_irq(void) | 313 | void __init pxa25x_init_irq(void) |
313 | { | 314 | { |
314 | pxa_init_irq(32, pxa25x_set_wake); | 315 | pxa_init_irq(32, pxa25x_set_wake); |
315 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 84, pxa25x_set_wake); | ||
316 | } | 316 | } |
317 | 317 | ||
318 | #ifdef CONFIG_CPU_PXA26x | 318 | #ifdef CONFIG_CPU_PXA26x |
319 | void __init pxa26x_init_irq(void) | 319 | void __init pxa26x_init_irq(void) |
320 | { | 320 | { |
321 | pxa_init_irq(32, pxa25x_set_wake); | 321 | pxa_init_irq(32, pxa25x_set_wake); |
322 | pxa_init_gpio(IRQ_GPIO_2_x, 2, 89, pxa25x_set_wake); | ||
323 | } | 322 | } |
324 | #endif | 323 | #endif |
325 | 324 | ||