From 7b2f4f8b1c4fb406e096da3de1bbf8eaa45d4113 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Wed, 11 Dec 2013 15:43:30 +0100
Subject: [PATCH] ARM: dts: am33xx: adjust mmc labels to be in sync with ref
 manual

---
 arch/arm/boot/dts/am335x-boneblack.dts | 4 ++--
 arch/arm/boot/dts/am335x-evm.dts       | 2 +-
 arch/arm/boot/dts/am335x-evmsk.dts     | 2 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi | 2 +-
 arch/arm/boot/dts/am335x-nano.dts      | 6 +++---
 arch/arm/boot/dts/am33xx.dtsi          | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 305975d3f531..61f1ac8dd5d3 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -16,11 +16,11 @@
 	regulator-always-on;
 };
 
-&mmc1 {
+&mmc0 {
 	vmmc-supply = <&vmmcsd_fixed>;
 };
 
-&mmc2 {
+&mmc1 {
 	vmmc-supply = <&vmmcsd_fixed>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_pins>;
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index e2156a583de7..a5b858cc0d32 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -648,7 +648,7 @@
 	};
 };
 
-&mmc1 {
+&mmc0 {
 	status = "okay";
 	vmmc-supply = <&vmmc_reg>;
 	bus-width = <4>;
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 80a3b215e7d6..930ea2c04b4a 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -517,7 +517,7 @@
 	dual_emac_res_vlan = <2>;
 };
 
-&mmc1 {
+&mmc0 {
 	status = "okay";
 	vmmc-supply = <&vmmc_reg>;
 	bus-width = <4>;
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index a1a0cc5eb35c..ae5825d7b07e 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -200,7 +200,7 @@
 	};
 };
 
-&mmc1 {
+&mmc0 {
 	status = "okay";
 	vmmc-supply = <&vmmc>;
 	bus-width = <4>;
diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index a3466455b171..2332c77e3c35 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -146,7 +146,7 @@
 		>;
 	};
 
-	mmc1_pins: mmc1_pins {
+	mmc0_pins: mmc0_pins {
 		pinctrl-single,pins = <
 			0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat0.mmc0_dat0 */
 			0xf4 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat1.mmc0_dat1 */
@@ -361,11 +361,11 @@
 	dual_emac_res_vlan = <2>;
 };
 
-&mmc1 {
+&mmc0 {
 	status = "okay";
 	vmmc-supply = <&ldo4_reg>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&mmc1_pins>;
+	pinctrl-0 = <&mmc0_pins>;
 	bus-width = <4>;
 	cd-gpios = <&gpio3 8 0>;
 	wp-gpios = <&gpio3 18 0>;
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 4a4e02d0ce9e..cd891f876937 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -277,7 +277,7 @@
 			status = "disabled";
 		};
 
-		mmc1: mmc@48060000 {
+		mmc0: mmc@48060000 {
 			compatible = "ti,omap4-hsmmc";
 			ti,hwmods = "mmc1";
 			ti,dual-volt;
@@ -292,7 +292,7 @@
 			status = "disabled";
 		};
 
-		mmc2: mmc@481d8000 {
+		mmc1: mmc@481d8000 {
 			compatible = "ti,omap4-hsmmc";
 			ti,hwmods = "mmc2";
 			ti,needs-special-reset;
@@ -305,7 +305,7 @@
 			status = "disabled";
 		};
 
-		mmc3: mmc@47810000 {
+		mmc2: mmc@47810000 {
 			compatible = "ti,omap4-hsmmc";
 			ti,hwmods = "mmc3";
 			ti,needs-special-reset;
-- 
2.39.2