diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-06-27 23:44:59 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-03 01:25:00 -0400 |
commit | 72beabae635b9485510ccf8093df319f59eb6688 (patch) | |
tree | e01b23031dbc4058b842fd9b47ced7f79931d2a4 /arch/arm | |
parent | d54dbb5000fca9863e8a2cb0e6467a424a1eb6e0 (diff) |
ARM: dts: imx23-evk: updates for mmc device
The 8-bit mode mmc has pin conflicts with display. Let's use 4-bit
mode by default, so that display can be enabled together later.
Also add vmmc-supply for mmc device.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx23-evk.dts | 17 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 16 |
2 files changed, 31 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 6a0912b286a0..8321fa3f0cf2 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts | |||
@@ -25,9 +25,10 @@ | |||
25 | ssp0: ssp@80010000 { | 25 | ssp0: ssp@80010000 { |
26 | compatible = "fsl,imx23-mmc"; | 26 | compatible = "fsl,imx23-mmc"; |
27 | pinctrl-names = "default"; | 27 | pinctrl-names = "default"; |
28 | pinctrl-0 = <&mmc0_8bit_pins_a &mmc0_pins_fixup>; | 28 | pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>; |
29 | bus-width = <8>; | 29 | bus-width = <4>; |
30 | wp-gpios = <&gpio1 30 0>; | 30 | wp-gpios = <&gpio1 30 0>; |
31 | vmmc-supply = <®_vddio_sd0>; | ||
31 | status = "okay"; | 32 | status = "okay"; |
32 | }; | 33 | }; |
33 | 34 | ||
@@ -57,4 +58,16 @@ | |||
57 | }; | 58 | }; |
58 | }; | 59 | }; |
59 | }; | 60 | }; |
61 | |||
62 | regulators { | ||
63 | compatible = "simple-bus"; | ||
64 | |||
65 | reg_vddio_sd0: vddio-sd0 { | ||
66 | compatible = "regulator-fixed"; | ||
67 | regulator-name = "vddio-sd0"; | ||
68 | regulator-min-microvolt = <3300000>; | ||
69 | regulator-max-microvolt = <3300000>; | ||
70 | gpio = <&gpio1 29 0>; | ||
71 | }; | ||
72 | }; | ||
60 | }; | 73 | }; |
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 7274273998f2..daade4fa1500 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
@@ -123,6 +123,22 @@ | |||
123 | fsl,pull-up = <0>; | 123 | fsl,pull-up = <0>; |
124 | }; | 124 | }; |
125 | 125 | ||
126 | mmc0_4bit_pins_a: mmc0-4bit@0 { | ||
127 | reg = <0>; | ||
128 | fsl,pinmux-ids = < | ||
129 | 0x2020 /* MX23_PAD_SSP1_DATA0__SSP1_DATA0 */ | ||
130 | 0x2030 /* MX23_PAD_SSP1_DATA1__SSP1_DATA1 */ | ||
131 | 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ | ||
132 | 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ | ||
133 | 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ | ||
134 | 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ | ||
135 | 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ | ||
136 | >; | ||
137 | fsl,drive-strength = <1>; | ||
138 | fsl,voltage = <1>; | ||
139 | fsl,pull-up = <1>; | ||
140 | }; | ||
141 | |||
126 | mmc0_8bit_pins_a: mmc0-8bit@0 { | 142 | mmc0_8bit_pins_a: mmc0-8bit@0 { |
127 | reg = <0>; | 143 | reg = <0>; |
128 | fsl,pinmux-ids = < | 144 | fsl,pinmux-ids = < |