Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / gumstix.c

diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index d8962a0fb98d98d4a113db16b5f2e7ef41fc4537..e296ce11658c48633aae5c696fbcaab1355e9ec2 100644 (file)
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -184,15 +184,22 @@ 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,
 };
 
+int __attribute__((weak)) am200_init(void)
+{
+       return 0;
+}
+
+static void __init carrier_board_init(void)
+{
+       /*
+        * put carrier/expansion board init here if
+        * they cannot be detected programatically
+        */
+       am200_init();
+}
+
 static void __init gumstix_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config));
@@ -201,6 +208,7 @@ static void __init gumstix_init(void)
        gumstix_udc_init();
        gumstix_mmc_init();
        (void) platform_add_devices(devices, ARRAY_SIZE(devices));
+       carrier_board_init();
 }
 
 MACHINE_START(GUMSTIX, "Gumstix")