diff options
| author | Jaya Kumar <jayakumar.lkml@gmail.com> | 2008-11-29 22:23:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:08 +0000 |
| commit | 854feaede51c155897335f1f0ca7acda96b04a64 (patch) | |
| tree | fb2475f0833cfdb50858cd0e28e059bace36cad2 | |
| parent | 1124d6d21f80ec10cc962e2961c21a8dd1e0ca6a (diff) | |
[ARM] 5337/1: gumstix: move am200 specific gpio pins into am200epd.
The gpio setup for AM200 specific GPIO pins should be done in the AM200
code rather than in generic gumstix code.
Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/am200epd.c | 15 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/gumstix.c | 7 |
2 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c index b965085a37b9..3a4f8d855a52 100644 --- a/arch/arm/mach-pxa/am200epd.c +++ b/arch/arm/mach-pxa/am200epd.c @@ -30,8 +30,12 @@ #include <linux/irq.h> #include <linux/gpio.h> +#include <mach/gumstix.h> +#include <mach/mfp-pxa25x.h> #include <mach/pxafb.h> +#include "generic.h" + #include <video/metronomefb.h> static unsigned int panel_type = 6; @@ -331,6 +335,15 @@ static struct metronome_board am200_board = { .cleanup = am200_cleanup, }; +static unsigned long am200_pin_config[] __initdata = { + GPIO51_GPIO, + GPIO49_GPIO, + GPIO48_GPIO, + GPIO32_GPIO, + GPIO17_GPIO, + GPIO16_GPIO, +}; + static int __init am200_init(void) { int ret; @@ -339,6 +352,8 @@ static int __init am200_init(void) * creation events */ fb_register_client(&am200_fb_notif); + pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config)); + /* request our platform independent driver */ request_module("metronomefb"); diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index d8962a0fb98d..06bc6674b015 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c @@ -184,13 +184,6 @@ static unsigned long gumstix_pin_config[] __initdata = { GPIO6_MMC_CLK, GPIO53_MMC_CLK, GPIO8_MMC_CS0, - /* these are used by AM200EPD */ - GPIO51_GPIO, - GPIO49_GPIO, - GPIO48_GPIO, - GPIO32_GPIO, - GPIO17_GPIO, - GPIO16_GPIO, }; static void __init gumstix_init(void) |