From 1914eede47274d5585927cb3572a1f937fbb7e2d Mon Sep 17 00:00:00 2001
From: Juergen Beisert <j.beisert@pengutronix.de>
Date: Sat, 5 Jul 2008 10:03:01 +0200
Subject: [PATCH] --- yaml --- r: 100891 b: refs/heads/master c:
 ff6552e4f3505da9c2886098773146be71c872e3 h: refs/heads/master i:   100889:
 27bb500595ba601e02a7bf23cfb3fa6f12e09719   100887:
 974f2095af6ffc4d420590de27c0272cf0c3db65 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-mx2/Kconfig               | 14 ++++++++
 trunk/arch/arm/mach-mx2/Makefile              |  1 +
 trunk/arch/arm/mach-mx2/pcm038.c              |  4 +++
 trunk/arch/arm/mach-mx2/pcm970-baseboard.c    | 32 +++++++++++++++++++
 trunk/include/asm-arm/arch-mxc/board-pcm038.h |  5 +++
 6 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/mach-mx2/pcm970-baseboard.c

diff --git a/[refs] b/[refs]
index b771ca129e78..a2ac895bd351 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e5e9f5457f5cd019fd7e2f3da94e9fc72cc9ff6
+refs/heads/master: ff6552e4f3505da9c2886098773146be71c872e3
diff --git a/trunk/arch/arm/mach-mx2/Kconfig b/trunk/arch/arm/mach-mx2/Kconfig
index 4c19e1c79471..1eaa97cb716d 100644
--- a/trunk/arch/arm/mach-mx2/Kconfig
+++ b/trunk/arch/arm/mach-mx2/Kconfig
@@ -23,3 +23,17 @@ config MACH_PCM038
 	help
 	  Include support for phyCORE-i.MX27 (aka pcm038) platform. This
 	  includes specific configurations for the module and its peripherals.
+
+choice
+	prompt "Baseboard"
+	depends on MACH_PCM038
+	default MACH_PCM970_BASEBOARD
+
+config MACH_PCM970_BASEBOARD
+	prompt "PHYTEC PCM970 development board"
+	bool
+	help
+	  This adds board specific devices that can be found on Phytec's
+	  PCM970 evaluation board.
+
+endchoice
diff --git a/trunk/arch/arm/mach-mx2/Makefile b/trunk/arch/arm/mach-mx2/Makefile
index f8d3836ee2f5..382d86080e86 100644
--- a/trunk/arch/arm/mach-mx2/Makefile
+++ b/trunk/arch/arm/mach-mx2/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_MACH_MX27) += clock_imx27.o
 
 obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
 obj-$(CONFIG_MACH_PCM038) += pcm038.o
+obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/trunk/arch/arm/mach-mx2/pcm038.c b/trunk/arch/arm/mach-mx2/pcm038.c
index 46fc026138cc..a9a28f58e714 100644
--- a/trunk/arch/arm/mach-mx2/pcm038.c
+++ b/trunk/arch/arm/mach-mx2/pcm038.c
@@ -177,6 +177,10 @@ static void __init pcm038_init(void)
 		imx_init_uart(i, &uart_pdata[i]);
 
 	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
+#ifdef CONFIG_MACH_PCM970_BASEBOARD
+	pcm970_baseboard_init();
+#endif
 }
 
 static void __init pcm038_timer_init(void)
diff --git a/trunk/arch/arm/mach-mx2/pcm970-baseboard.c b/trunk/arch/arm/mach-mx2/pcm970-baseboard.c
new file mode 100644
index 000000000000..028ac4d33684
--- /dev/null
+++ b/trunk/arch/arm/mach-mx2/pcm970-baseboard.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+/*
+ * system init for baseboard usage. Will be called by pcm038 init.
+ *
+ * Add platform devices present on this baseboard and init
+ * them from CPU side as far as required to use them later on
+ */
+void __init pcm970_baseboard_init(void)
+{
+}
diff --git a/trunk/include/asm-arm/arch-mxc/board-pcm038.h b/trunk/include/asm-arm/arch-mxc/board-pcm038.h
index 300467e8db66..750c62afd90f 100644
--- a/trunk/include/asm-arm/arch-mxc/board-pcm038.h
+++ b/trunk/include/asm-arm/arch-mxc/board-pcm038.h
@@ -30,7 +30,12 @@
  * its own devices, it calls baseboard's init function.
  * TODO: Add your own baseboard init function and call it from
  * inside pcm038_init().
+ *
+ * This example here is for the development board. Refer pcm970-baseboard.c
  */
+
+extern void pcm970_baseboard_init(void);
+
 #endif
 
 #endif /* __ASM_ARCH_MXC_BOARD_PCM038_H__ */