diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-03-27 17:40:20 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-03-28 08:57:25 -0700 |
| commit | 26bfad63ca896fde674918e36a8b8fd7039a0119 (patch) | |
| tree | ed55f627d3e15d3a875ea3278983cf5f74749f6e | |
| parent | 7a9b248446dfd7c2d65030159e5c152a911aaf42 (diff) | |
ARM: dts: omap4-droid4: Fix MMC1 card for detect GPIO and regulator
There's a typo, it should be GPIO176 and not GPIO106.
And it seems I messed up the regulators at some point while trying
to figure out what devices the regulators are used. The correct
regulator for MMC1 is vwlan2.
Fixes: 0d4cb3ccee58 ("ARM: dts: Configure regulators for droid 4")
Reported-by: Sebastian Reichel <sre@kernel.org>
Reviewed-by: Sebastian Reichel <sre@kernel.org>
Tested-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4-droid4-xt894.dts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi index e02982d69854..49b76aa16e5f 100644 --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi @@ -155,6 +155,7 @@ regulator-enable-ramp-delay = <1000>; }; + /* Used by micro-SDIO at mmc1 */ vwlan2: VWLAN2 { regulator-min-microvolt = <3000000>; regulator-max-microvolt = <3000000>; @@ -167,7 +168,6 @@ regulator-enable-ramp-delay = <1000>; }; - /* Used by micro-SDIO at mmc1 */ vsimcard: VSIMCARD { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <2900000>; diff --git a/arch/arm/boot/dts/omap4-droid4-xt894.dts b/arch/arm/boot/dts/omap4-droid4-xt894.dts index d381707f33f3..f27966e3cbc0 100644 --- a/arch/arm/boot/dts/omap4-droid4-xt894.dts +++ b/arch/arm/boot/dts/omap4-droid4-xt894.dts @@ -284,9 +284,9 @@ }; &mmc1 { - vmmc-supply = <&vsimcard>; + vmmc-supply = <&vwlan2>; bus-width = <4>; - cd-gpios = <&gpio4 10 GPIO_ACTIVE_LOW>; /* gpio106 */ + cd-gpios = <&gpio6 16 GPIO_ACTIVE_LOW>; /* gpio176 */ }; &mmc2 { |