From 449d70ea1fd0558fec15097aa93a6f9797fbfa2d Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Fri, 20 Jan 2012 14:15:58 +0100
Subject: [PATCH] --- yaml --- r: 303163 b: refs/heads/master c:
 efcf1e502012cc2cc9ee8165fa0a7679725c525c h: refs/heads/master i:   303161:
 2bb70c9422c80fa6070c8c38e65627b7eecf8e15   303159:
 02467cb7b142930b28c5ce8024aeed5f78f93c42 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/arm/boot/dts/omap4.dtsi  | 32 +++++++++++++++++++++++++++++
 trunk/arch/arm/mach-omap2/devices.c |  4 +++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d1505b89176..399f79468306 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 385a64bbc2d2c3ef864190b010c74afc5b850195
+refs/heads/master: efcf1e502012cc2cc9ee8165fa0a7679725c525c
diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi
index 7f8463b666fd..6c584534c290 100644
--- a/trunk/arch/arm/boot/dts/omap4.dtsi
+++ b/trunk/arch/arm/boot/dts/omap4.dtsi
@@ -209,5 +209,37 @@
 			#size-cells = <0>;
 			ti,hwmods = "i2c4";
 		};
+
+		mcspi1: spi@48098000 {
+			compatible = "ti,omap4-mcspi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ti,hwmods = "mcspi1";
+			ti,spi-num-cs = <4>;
+		};
+
+		mcspi2: spi@4809a000 {
+			compatible = "ti,omap4-mcspi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ti,hwmods = "mcspi2";
+			ti,spi-num-cs = <2>;
+		};
+
+		mcspi3: spi@480b8000 {
+			compatible = "ti,omap4-mcspi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ti,hwmods = "mcspi3";
+			ti,spi-num-cs = <2>;
+		};
+
+		mcspi4: spi@480ba000 {
+			compatible = "ti,omap4-mcspi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			ti,hwmods = "mcspi4";
+			ti,spi-num-cs = <1>;
+		};
 	};
 };
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
index 283d11eae693..8a489ba68714 100644
--- a/trunk/arch/arm/mach-omap2/devices.c
+++ b/trunk/arch/arm/mach-omap2/devices.c
@@ -725,7 +725,9 @@ static int __init omap2_init_devices(void)
 	omap_init_dmic();
 	omap_init_camera();
 	omap_init_mbox();
-	omap_init_mcspi();
+	/* If dtb is there, the devices will be created dynamically */
+	if (!of_have_populated_dt())
+		omap_init_mcspi();
 	omap_init_pmu();
 	omap_hdq_init();
 	omap_init_sti();