diff options
| author | Jaya Kumar <jayakumar.lkml@gmail.com> | 2008-12-09 17:14:29 +0300 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2008-12-17 17:51:38 +0300 |
| commit | 3332b0c17969d91d8868d2d003e685c420d84262 (patch) | |
| tree | ea706af11e2473c8336bb6ec28d22f2d11b21a7f /arch/arm/mach-pxa/gumstix.c | |
| parent | 07f651c72ac0530033883c113939d9b9c7fa75e5 (diff) | |
| download | linux-3332b0c17969d91d8868d2d003e685c420d84262.tar.xz | |
[ARM] pxa/gumstix: fix incorrect init done by am200
Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Cc: Andre Puschmann <andre.puschmann@imms.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/gumstix.c')
| -rw-r--r-- | arch/arm/mach-pxa/gumstix.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index d8962a0fb98d..14d5103dafc9 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") |