diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-15 11:12:48 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 04:49:32 -0400 |
commit | a3f8c564825d08db7daa8b703271dad96c74a946 (patch) | |
tree | 4b9a1fd77322ef089494f4888694d8d28855e4e5 /arch/arm/boot/dts/imx28-cfa10036.dts | |
parent | 01d41c9cdb08e3652529810e531704d6a445b4ca (diff) |
ARM: dt: imx28-cfa10036: introduce a regulator for mmc0
The PWM3 pinmux configuration conflicts with gpio 3.28. Introduce a regulator
for mmc0 so that it conflicts with the pwm driver and fails gracefully. The
kernel will then able to access mmc0 normally.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx28-cfa10036.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10036.dts | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index ae7c3390e65a..b04b6b8850a7 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/arch/arm/boot/dts/imx28-cfa10036.dts | |||
@@ -53,6 +53,17 @@ | |||
53 | fsl,pull-up = <MXS_PULL_DISABLE>; | 53 | fsl,pull-up = <MXS_PULL_DISABLE>; |
54 | }; | 54 | }; |
55 | 55 | ||
56 | mmc_pwr_cfa10036: mmc_pwr_cfa10036@0 { | ||
57 | reg = <0>; | ||
58 | fsl,pinmux-ids = < | ||
59 | 0x31c3 /* | ||
60 | MX28_PAD_PWM3__GPIO_3_28 */ | ||
61 | >; | ||
62 | fsl,drive-strength = <0>; | ||
63 | fsl,voltage = <1>; | ||
64 | fsl,pull-up = <0>; | ||
65 | }; | ||
66 | |||
56 | }; | 67 | }; |
57 | 68 | ||
58 | ssp0: ssp@80010000 { | 69 | ssp0: ssp@80010000 { |
@@ -60,6 +71,7 @@ | |||
60 | pinctrl-names = "default"; | 71 | pinctrl-names = "default"; |
61 | pinctrl-0 = <&mmc0_4bit_pins_a | 72 | pinctrl-0 = <&mmc0_4bit_pins_a |
62 | &mmc0_cd_cfg &mmc0_sck_cfg>; | 73 | &mmc0_cd_cfg &mmc0_sck_cfg>; |
74 | vmmc-supply = <®_vddio_sd0>; | ||
63 | bus-width = <4>; | 75 | bus-width = <4>; |
64 | status = "okay"; | 76 | status = "okay"; |
65 | }; | 77 | }; |
@@ -116,4 +128,14 @@ | |||
116 | default-state = "on"; | 128 | default-state = "on"; |
117 | }; | 129 | }; |
118 | }; | 130 | }; |
131 | |||
132 | reg_vddio_sd0: vddio-sd0 { | ||
133 | compatible = "regulator-fixed"; | ||
134 | pinctrl-names = "default"; | ||
135 | pinctrl-0 = <&mmc_pwr_cfa10036>; | ||
136 | regulator-name = "vddio-sd0"; | ||
137 | regulator-min-microvolt = <3300000>; | ||
138 | regulator-max-microvolt = <3300000>; | ||
139 | gpio = <&gpio3 28 0>; | ||
140 | }; | ||
119 | }; | 141 | }; |