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>

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index e02982d69854fc721d860eb4c593c473013e6687..49b76aa16e5fab2aaaa54f910f24aaed6cd9e927 100644 (file)
--- 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 d381707f33f36935eca0753cc53f3b570e4b5765..f27966e3cbc05e83fbea6f9ecfd778f10061afb2 100644 (file)
--- 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 {