Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[karo-tx-linux.git] / arch / arm / boot / dts / am335x-nano.dts

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 5ed4ca6eaf55b6ea0adeae9f0ea635fce453a6ef..23c7678dc20fa6667739d1ffcff74c74c78641bb 100644 (file)
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -146,7 +146,7 @@
                >;
        };
 
-       mmc1_pins: mmc1_pins {
+       mmc0_pins: mmc0_pins {
                pinctrl-single,pins = <
                        0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat0.mmc0_dat0 */
                        0xf4 (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat1.mmc0_dat1 */
@@ -365,11 +365,11 @@
        dual_emac_res_vlan = <2>;
 };
 
-&mmc1 {
+&mmc0 {
        status = "okay";
        vmmc-supply = <&ldo4_reg>;
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc1_pins>;
+       pinctrl-0 = <&mmc0_pins>;
        bus-width = <4>;
        cd-gpios = <&gpio3 8 0>;
        wp-gpios = <&gpio3 18 0>;