Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / am43x-epos-evm.dts

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index a3a53ce84f1619dfca675c43ea9d699aa44e949f..167dbc8494deef2ba3bd9c63a7bf20afe9ddb21f 100644 (file)
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -132,6 +132,12 @@
                                0x19c (PIN_OUTPUT | MUX_MODE3)          /* mcasp0_ahclkr.spi1_cs0 */
                        >;
                };
+
+               mmc1_pins: pinmux_mmc1_pins {
+                       pinctrl-single,pins = <
+                               0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
+                       >;
+               };
        };
 
        matrix_keypad: matrix_keypad@0 {
@@ -179,6 +185,9 @@
        status = "okay";
        vmmc-supply = <&vmmcsd_fixed>;
        bus-width = <4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins>;
+       cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
 };
 
 &mac {