]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>
Mon, 22 May 2017 09:01:52 +0000 (11:01 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 26 May 2017 15:24:52 +0000 (08:24 -0700)
The second version of the hardware moved the card detect pin from gpio0_6
to gpio1_9, as we won't support the first hardware version fix the pinmux
configuration of this pin.

Fixes: 8584d4fc ("ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.")
Cc: <stable@vger.kernel.org> # 4.11
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/am335x-sl50.dts

index c5d2589c55fc3ddfab5909413e7bbfe59aba50f7..da4f8e376b9f998e5ff5abc73ee690dacd6fd16d 100644 (file)
 
        mmc1_pins: pinmux_mmc1_pins {
                pinctrl-single,pins = <
-                       AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)              /* spi0_cs1.gpio0_6 */
+                       AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7)              /* uart0_rtsn.gpio1_9 */
                >;
        };
 
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins>;
        bus-width = <4>;
-       cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+       cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
        vmmc-supply = <&vmmcsd_fixed>;
 };