From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 28 Jun 2012 03:45:01 +0000 (+0800)
Subject: ARM: dts: imx28-evk: add vmmc-supply for mmc device
X-Git-Tag: next-20120724~11^2~14^2~16^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=64edbcdd9c8d2aac36bead7f8cdafe0ec02bab40;p=karo-tx-linux.git

ARM: dts: imx28-evk: add vmmc-supply for mmc device

Add vmmc-supply for mmc device, so that the power to mmc slot can be
turned on by mmc driver if bootloader hasn't done it.

Also remove "okay" status for mmc1/ssp1, as the device has pin conflict
with gpmi-nand.  Actually the device is already disabled since the
mxs-mmc driver adopts pinctrl support because there is no pinctrl setup
for the device in dts.  Make this explicit by removing "okay" status.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 505ae5e541c3..28b94d309998 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -35,6 +35,7 @@
 					&mmc0_cd_cfg &mmc0_sck_cfg>;
 				bus-width = <8>;
 				wp-gpios = <&gpio2 12 0>;
+				vmmc-supply = <&reg_vddio_sd0>;
 				status = "okay";
 			};
 
@@ -42,7 +43,6 @@
 				compatible = "fsl,imx28-mmc";
 				bus-width = <8>;
 				wp-gpios = <&gpio0 28 0>;
-				status = "okay";
 			};
 
 			pinctrl@80018000 {
@@ -141,6 +141,14 @@
 			regulator-max-microvolt = <3300000>;
 			regulator-always-on;
 		};
+
+		reg_vddio_sd0: vddio-sd0 {
+			compatible = "regulator-fixed";
+			regulator-name = "vddio-sd0";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio3 28 0>;
+		};
 	};
 
 	sound {