summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/gumstix.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-23 18:06:37 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-23 18:06:37 +0000
commit40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch)
tree0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /arch/arm/mach-pxa/gumstix.c
parentd83a12a40915774332cec625856c2e7ba9033e15 (diff)
parent3b24f30c4f678cfab5c6d090af9559fefa37cc41 (diff)
downloadop-kernel-dev-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.zip
op-kernel-dev-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.tar.gz
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts: arch/arm/mach-pxa/am200epd.c arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'arch/arm/mach-pxa/gumstix.c')
-rw-r--r--arch/arm/mach-pxa/gumstix.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 06bc667..e296ce1 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -186,6 +186,20 @@ static unsigned long gumstix_pin_config[] __initdata = {
GPIO8_MMC_CS0,
};
+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));
@@ -194,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")
OpenPOWER on IntegriCloud