From 5d7d6cfcf0a9e1c934aed722f02e4a273e16f0a3 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Tue, 4 Oct 2011 17:10:27 +0530
Subject: [PATCH] --- yaml --- r: 303167 b: refs/heads/master c:
 7498176803ca57200ce658da3850abcabb5cff84 h: refs/heads/master i:   303165:
 ed396fa337ffaaa9484404c05cb3603416e653eb   303163:
 449d70ea1fd0558fec15097aa93a6f9797fbfa2d   303159:
 02467cb7b142930b28c5ce8024aeed5f78f93c42   303151:
 baf269387abcbfbae6d0c68a51f3ee86a4e61923   303135:
 359d48a7886cc1971e8558279af4c96a22b77345   303103:
 9f474f7c6cfc3ab1a97e9cdc0b28bb05351a865d v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/boot/dts/omap4-panda.dts | 22 ++++++++++++++++++
 trunk/arch/arm/boot/dts/omap4-sdp.dts   | 24 +++++++++++++++++++
 trunk/arch/arm/boot/dts/omap4.dtsi      | 31 +++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64a8767293dd..59d103dd3fff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecc7b060a76d2b454be79abe2c6b934dee850413
+refs/heads/master: 7498176803ca57200ce658da3850abcabb5cff84
diff --git a/trunk/arch/arm/boot/dts/omap4-panda.dts b/trunk/arch/arm/boot/dts/omap4-panda.dts
index 29646dc97229..ea6f5bb8a120 100644
--- a/trunk/arch/arm/boot/dts/omap4-panda.dts
+++ b/trunk/arch/arm/boot/dts/omap4-panda.dts
@@ -52,3 +52,25 @@
 &i2c4 {
 	clock-frequency = <400000>;
 };
+
+&mmc1 {
+	vmmc-supply = <&vmmc>;
+	ti,bus-width = <8>;
+};
+
+&mmc2 {
+	status = "disable";
+};
+
+&mmc3 {
+	status = "disable";
+};
+
+&mmc4 {
+	status = "disable";
+};
+
+&mmc5 {
+	ti,non-removable;
+	ti,bus-width = <4>;
+};
diff --git a/trunk/arch/arm/boot/dts/omap4-sdp.dts b/trunk/arch/arm/boot/dts/omap4-sdp.dts
index 31938c1c3f14..67b2e98074c6 100644
--- a/trunk/arch/arm/boot/dts/omap4-sdp.dts
+++ b/trunk/arch/arm/boot/dts/omap4-sdp.dts
@@ -91,3 +91,27 @@
 		vdd-supply = <&vdd_eth>;
 	};
 };
+
+&mmc1 {
+	vmmc-supply = <&vmmc>;
+	ti,bus-width = <8>;
+};
+
+&mmc2 {
+	vmmc-supply = <&vaux1>;
+	ti,bus-width = <8>;
+	ti,non-removable;
+};
+
+&mmc3 {
+	status = "disable";
+};
+
+&mmc4 {
+	status = "disable";
+};
+
+&mmc5 {
+	ti,bus-width = <4>;
+	ti,non-removable;
+};
diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi
index 6c584534c290..359c4979c8aa 100644
--- a/trunk/arch/arm/boot/dts/omap4.dtsi
+++ b/trunk/arch/arm/boot/dts/omap4.dtsi
@@ -241,5 +241,36 @@
 			ti,hwmods = "mcspi4";
 			ti,spi-num-cs = <1>;
 		};
+
+		mmc1: mmc@4809c000 {
+			compatible = "ti,omap4-hsmmc";
+			ti,hwmods = "mmc1";
+			ti,dual-volt;
+			ti,needs-special-reset;
+		};
+
+		mmc2: mmc@480b4000 {
+			compatible = "ti,omap4-hsmmc";
+			ti,hwmods = "mmc2";
+			ti,needs-special-reset;
+		};
+
+		mmc3: mmc@480ad000 {
+			compatible = "ti,omap4-hsmmc";
+			ti,hwmods = "mmc3";
+			ti,needs-special-reset;
+		};
+
+		mmc4: mmc@480d1000 {
+			compatible = "ti,omap4-hsmmc";
+			ti,hwmods = "mmc4";
+			ti,needs-special-reset;
+		};
+
+		mmc5: mmc@480d5000 {
+			compatible = "ti,omap4-hsmmc";
+			ti,hwmods = "mmc5";
+			ti,needs-special-reset;
+		};
 	};
 };