From 9b32c214dadfa53bac0618dbd1091654550712e2 Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Tue, 22 Sep 2015 15:11:56 +0800 Subject: [PATCH] MLK-11407-7: ARM: dts: imx7d-sdb: move WDOG_B setting into wdog drivr enable 'fsl,wdog_b' and move pinctrl setting from hog into watchdog driver device node. Signed-off-by: Robin Gong --- arch/arm/boot/dts/imx7d-sdb.dts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index ebf2a11659d8..b23ed1e3a03a 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -471,7 +471,6 @@ fsl,pins = < MX7D_PAD_GPIO1_IO05__GPIO1_IO5 0x14 MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x59 - MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 >; }; @@ -480,6 +479,13 @@ MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0 >; }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 + >; + }; + }; }; @@ -567,6 +573,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>; fsl,ext-reset-output; + fsl,wdog_b; }; &gpmi { @@ -920,10 +927,5 @@ >; }; - pinctrl_wdog: wdoggrp { - fsl,pins = < - MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 - >; - }; }; }; -- 2.17.1