diff options
author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-04-09 06:12:04 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-04-10 22:00:05 -0400 |
commit | b8f649f1f531914a30ecb420e7565ee04dccc2ad (patch) | |
tree | 42b2bc905fce1c892511ff81a250d7330b33a4ed /arch/arm/mach-mmp/flint.c | |
parent | 2cab0292285ce3180224c130d2fb1104aee44ff1 (diff) |
ARM: pxa: move PXA_GPIO_TO_IRQ macro
Since PXA_GPIO_TO_IRQ() & MMP_GPIO_TO_IRQ() macro are depended on
arch code, move them from gpio driver to platform driver instead.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-mmp/flint.c')
-rw-r--r-- | arch/arm/mach-mmp/flint.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c index 754c352dd02b..6291c33d83e2 100644 --- a/arch/arm/mach-mmp/flint.c +++ b/arch/arm/mach-mmp/flint.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/smc91x.h> | 16 | #include <linux/smc91x.h> |
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
19 | #include <linux/gpio-pxa.h> | ||
19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
20 | 21 | ||
21 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
@@ -77,6 +78,10 @@ static unsigned long flint_pin_config[] __initdata = { | |||
77 | GPIO160_ND_RDY1, | 78 | GPIO160_ND_RDY1, |
78 | }; | 79 | }; |
79 | 80 | ||
81 | static struct pxa_gpio_platform_data mmp2_gpio_pdata = { | ||
82 | .irq_base = MMP_GPIO_TO_IRQ(0), | ||
83 | }; | ||
84 | |||
80 | static struct smc91x_platdata flint_smc91x_info = { | 85 | static struct smc91x_platdata flint_smc91x_info = { |
81 | .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, | 86 | .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, |
82 | }; | 87 | }; |
@@ -111,6 +116,8 @@ static void __init flint_init(void) | |||
111 | /* on-chip devices */ | 116 | /* on-chip devices */ |
112 | mmp2_add_uart(1); | 117 | mmp2_add_uart(1); |
113 | mmp2_add_uart(2); | 118 | mmp2_add_uart(2); |
119 | platform_device_add_data(&mmp2_device_gpio, &mmp2_gpio_pdata, | ||
120 | sizeof(struct pxa_gpio_platform_data)); | ||
114 | platform_device_register(&mmp2_device_gpio); | 121 | platform_device_register(&mmp2_device_gpio); |
115 | 122 | ||
116 | /* off-chip devices */ | 123 | /* off-chip devices */ |