Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx7s-warp.dts

diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 0345267f3390e59eaa675b4e601f3aac52a98304..07b63f8b7314595980f928e06c68ee8e602a6111 100644 (file)
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -295,6 +295,7 @@
        assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
        assigned-clock-rates = <400000000>;
        bus-width = <8>;
+       no-1-8-v;
        fsl,tuning-step = <2>;
        non-removable;
        status = "okay";
@@ -437,10 +438,12 @@
                        MX7D_PAD_SD3_RESET_B__SD3_RESET_B       0x1b
                >;
        };
+};
 
+&iomuxc_lpsr {
        pinctrl_wdog: wdoggrp {
                fsl,pins = <
-                       MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B       0x74
+                       MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B  0x74
                >;
        };
 };