summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-06-28 05:45:01 +0200
committerShawn Guo <shawn.guo@linaro.org>2012-07-03 07:25:12 +0200
commit64edbcdd9c8d2aac36bead7f8cdafe0ec02bab40 (patch)
treee3a02a7853be1921bb80804d58d87802c81e68bb /arch/arm/boot
parentARM: dts: imx23-evk: add auart device (diff)
downloadlinux-64edbcdd9c8d2aac36bead7f8cdafe0ec02bab40.tar.xz
linux-64edbcdd9c8d2aac36bead7f8cdafe0ec02bab40.zip
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')
-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 @@
&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 {