From 3332b0c17969d91d8868d2d003e685c420d84262 Mon Sep 17 00:00:00 2001 From: Jaya Kumar Date: Tue, 9 Dec 2008 22:14:29 +0800 Subject: [ARM] pxa/gumstix: fix incorrect init done by am200 Signed-off-by: Jaya Kumar Cc: Andre Puschmann Signed-off-by: Eric Miao --- arch/arm/mach-pxa/gumstix.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'arch/arm/mach-pxa/gumstix.c') diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index d8962a0fb98..14d5103dafc 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c @@ -193,6 +193,20 @@ static unsigned long gumstix_pin_config[] __initdata = { 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 +215,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") -- cgit v1.2.3