aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx28-evk.dts
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-27 23:45:01 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-07-03 01:25:12 -0400
commit64edbcdd9c8d2aac36bead7f8cdafe0ec02bab40 (patch)
treee3a02a7853be1921bb80804d58d87802c81e68bb /arch/arm/boot/dts/imx28-evk.dts
parenta450839432519beda04ffc286428b7e44b9dd488 (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts/imx28-evk.dts')
-rw-r--r--arch/arm/boot/dts/imx28-evk.dts10
1 files changed, 9 insertions, 1 deletions
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 @@
35 &mmc0_cd_cfg &mmc0_sck_cfg>; 35 &mmc0_cd_cfg &mmc0_sck_cfg>;
36 bus-width = <8>; 36 bus-width = <8>;
37 wp-gpios = <&gpio2 12 0>; 37 wp-gpios = <&gpio2 12 0>;
38 vmmc-supply = <&reg_vddio_sd0>;
38 status = "okay"; 39 status = "okay";
39 }; 40 };
40 41
@@ -42,7 +43,6 @@
42 compatible = "fsl,imx28-mmc"; 43 compatible = "fsl,imx28-mmc";
43 bus-width = <8>; 44 bus-width = <8>;
44 wp-gpios = <&gpio0 28 0>; 45 wp-gpios = <&gpio0 28 0>;
45 status = "okay";
46 }; 46 };
47 47
48 pinctrl@80018000 { 48 pinctrl@80018000 {
@@ -141,6 +141,14 @@
141 regulator-max-microvolt = <3300000>; 141 regulator-max-microvolt = <3300000>;
142 regulator-always-on; 142 regulator-always-on;
143 }; 143 };
144
145 reg_vddio_sd0: vddio-sd0 {
146 compatible = "regulator-fixed";
147 regulator-name = "vddio-sd0";
148 regulator-min-microvolt = <3300000>;
149 regulator-max-microvolt = <3300000>;
150 gpio = <&gpio3 28 0>;
151 };
144 }; 152 };
145 153
146 sound { 154 sound {