From: Fabio Estevam <festevam@gmail.com>
Date: Tue, 11 Sep 2018 20:10:45 +0000 (-0300)
Subject: ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog
X-Git-Tag: v4.20-rc1~66^2~18^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48d34c4acfca5a6cc317dbe5e9f33abceab9d72f;p=thirdparty%2Flinux.git

ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog

imx51-zii-scu2-mezz has an external watchdog in the environment
microcontroller, so disable the internal one.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
index fc4a32ce2a23d..243d1c8cab0a1 100644
--- a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
+++ b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
@@ -346,6 +346,10 @@
 	status = "disabled";
 };
 
+&wdog1 {
+	status = "disabled";
+};
+
 &iomuxc {
 	pinctrl_ecspi1: ecspi1grp {
 		fsl,pins = <