[ARM] 5337/1: gumstix: move am200 specific gpio pins into am200epd.
authorJaya Kumar <jayakumar.lkml@gmail.com>
Sat, 29 Nov 2008 21:23:13 +0000 (22:23 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Dec 2008 09:12:08 +0000 (09:12 +0000)
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>
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/gumstix.c

index b965085a37b9afe98d59b42403650c6ceaf0f055..3a4f8d855a521519941813e31b6714c33336e816 100644 (file)
 #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");
 
index d8962a0fb98d98d4a113db16b5f2e7ef41fc4537..06bc6674b015115c1e85fb76e89d2172ae1f7141 100644 (file)
@@ -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)