IKG5-1476 dts: minnow: Support multiple device tree revisions

Create hardware revision based dts files that include the common
configuration from omap3-minnow.dts.  The property mmi,hwrev
will be used by the bootloader to identify the matching device tree.

casper-p1 is a legacy board that predates the first real
minnow board.  As hardware differences are identified, they
should be migrated from the omap3-minnow.dts to the appropriate
revision based dts file.  Or if the majority of revisions are
expected to be configured identically, the setting can remain
common and overridden as needed.

Change-Id: I328044668f51d000612cfe0541bc464fcec6fe3d
Signed-off-by: James Wylder <jwylder@motorola.com>

5 files changed, 32 insertions, 4 deletions

diff --git a/AndroidKernel.mk b/AndroidKernel.mk
index 58aedd48cbb..955d42efdbf 100644
--- a/AndroidKernel.mk
+++ b/AndroidKernel.mk
@@ -5,7 +5,7 @@ KERNEL_SRCDIR := kernel/omap-moto-cw
 KERNEL_OUT := $(ANDROID_PRODUCT_OUT)/obj/KERNEL_OBJ
 KERNEL_CONFIG := $(KERNEL_OUT)/.config
 TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/arm/boot/zImage
-TARGET_PREBUILT_INT_DTB := $(KERNEL_OUT)/arch/arm/boot/dts/omap3-minnow.dtb
+TARGET_PREBUILT_INT_DTB := $(KERNEL_OUT)/arch/arm/boot/dts/omap3-casper-p1.dtb
 KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr
 KERNEL_MODULES_INSTALL := system
 KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 19a8faba463..5cd0d765c75 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -153,7 +153,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	am335x-evm.dtb \
 	am335x-evmsk.dtb \
 	am335x-bone.dtb
-dtb-$(CONFIG_MACH_MINNOW) += omap3-minnow.dtb
+dtb-$(CONFIG_MACH_MINNOW) += omap3-minnow-p0.dtb omap3-casper-p1.dtb
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
diff --git a/arch/arm/boot/dts/omap3-casper-p1.dts b/arch/arm/boot/dts/omap3-casper-p1.dts
new file mode 100644
index 00000000000..898da9be9b9
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-casper-p1.dts
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2013 Motorola Mobility LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+/include/ "omap3-minnow.dtsi"
+
+/ {
+	mmi,revision = "p1";
+	mmi,hwrev = <0xFE>;
+};
diff --git a/arch/arm/boot/dts/omap3-minnow-p0.dts b/arch/arm/boot/dts/omap3-minnow-p0.dts
new file mode 100644
index 00000000000..bfa9f4f354d
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-minnow-p0.dts
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2013 Motorola Mobility LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+/include/ "omap3-minnow.dtsi"
+
+/ {
+	mmi,revision = "p0";
+	mmi,hwrev = <0x00>;
+};
diff --git a/arch/arm/boot/dts/omap3-minnow.dts b/arch/arm/boot/dts/omap3-minnow.dtsi
index e88a2749286..46ff9960edf 100644
--- a/arch/arm/boot/dts/omap3-minnow.dts
+++ b/arch/arm/boot/dts/omap3-minnow.dtsi
@@ -5,8 +5,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-/dts-v1/;
-
 /include/ "omap36xx.dtsi"
 
 / {