---

yaml --- r: 342369 b: refs/heads/master c: 8ad49c6 h: refs/heads/master i: 342367: 70361ac v: v3
git-mirror · Nov 27, 2012 · 3e93604 · 3e93604
1 parent 6f18e17
commit 3e93604
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c94a4ab7af3f07424e3db0c77f6b532d0a7202de
+refs/heads/master: 8ad49c65f551c15af3f1049d10ccbdcd376a295d
diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi
@@ -638,8 +638,6 @@
 			regulator-name = "mmci-reg";
 			regulator-type = "voltage";
 
-			gpios = <&tc3589x_gpio 18 0x4>;
-			gpio-enable = <&tc3589x_gpio 17 0x4>;
 			states = <1800000 0x1
 				  2900000 0x0>;
 

diff --git a/trunk/arch/arm/boot/dts/hrefprev60.dts b/trunk/arch/arm/boot/dts/hrefprev60.dts
@@ -37,5 +37,12 @@
 				reset-gpio = <&tc3589x_gpio 13 0x4>;
 			};
 		};
+
+		vmmci: regulator-gpio {
+			gpios = <&tc3589x_gpio 18 0x4>;
+			gpio-enable = <&tc3589x_gpio 17 0x4>;
+
+			status = "okay";
+		};
 	};
 };