Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[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..d5237fd0fa657f90c2756ba3b5fef224a11170d6 100644 (file)
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -437,10 +437,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__WDOD1_WDOG_B  0x74
                >;
        };
 };