[PATCH 1/1] arm: add touchbook support

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Cc: Gregoire Gentil <gregoire at alwaysinnovating.com>
---
 arch/arm/boards/omap/Kconfig        |    9 +++++++++
 arch/arm/boards/omap/Makefile       |    1 +
 arch/arm/boards/omap/board-beagle.c |    7 ++++++-
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/arch/arm/boards/omap/Kconfig b/arch/arm/boards/omap/Kconfig
index d612064..615457f 100644
--- a/arch/arm/boards/omap/Kconfig
+++ b/arch/arm/boards/omap/Kconfig
@@ -51,6 +51,15 @@ config MACH_BEAGLE
 	  help
 	  Say Y here if you are using Beagle Board
 
+config MACH_TOUCHBOOK
+	bool "AlwaysInnovating TouchBook"
+	select MACH_HAS_LOWLEVEL_INIT
+	select OMAP_CLOCK_ALL
+	select HAS_OMAP_NAND
+	  help
+	  Say Y here if you are using touchbook
+	  http://www.alwaysinnovating.com/touchbook/
+
 config MACH_OMAP3EVM
 	bool "Texas Instrument's OMAP3 EVM"
 	select MACH_HAS_LOWLEVEL_INIT
diff --git a/arch/arm/boards/omap/Makefile b/arch/arm/boards/omap/Makefile
index 1e74e24..946d9bf 100644
--- a/arch/arm/boards/omap/Makefile
+++ b/arch/arm/boards/omap/Makefile
@@ -23,6 +23,7 @@
 obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += platform.o
 obj-$(CONFIG_MACH_OMAP343xSDP) += board-sdp343x.o
 obj-$(CONFIG_MACH_BEAGLE) += board-beagle.o
+obj-$(CONFIG_MACH_TOUCHBOOK) += board-beagle.o
 obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o
 obj-y += devices-gpmc-nand.o
 
diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index 6de2cce..8e9ab43 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -336,7 +336,12 @@ static int beagle_devices_init(void)
 
 	armlinux_add_dram(&sdram_dev);
 	armlinux_set_bootparams((void *)0x80000100);
-	armlinux_set_architecture(MACH_TYPE_OMAP3_BEAGLE);
+
+	if (machine_is_touchbook())
+		armlinux_set_architecture(MACH_TYPE_TOUCHBOOK);
+	else
+		armlinux_set_architecture(MACH_TYPE_OMAP3_BEAGLE);
+
 failed:
 	return ret;
 }
-- 
1.7.1