From: Joel Stanley <joel@jms.id.au>
Date: Wed, 4 Oct 2017 09:16:35 +0000 (+1030)
Subject: ARM: dts: aspeed: Enable watchdog two
X-Git-Tag: v4.15-rc1~75^2~45^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=eb746e5342ff7b80d4e2be72ccd85c84c434c1ee;p=linux.git

ARM: dts: aspeed: Enable watchdog two

The second watchdog is left running by u-boot in the common
configurations of the firmware shipped on ASPEED boards. Ensure a driver
is loaded so the system can succcessfully boot.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 5be2e6a39917..9bf84d2ba038 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -212,7 +212,6 @@ wdt1: watchdog@1e785000 {
 			wdt2: watchdog@1e785020 {
 				compatible = "aspeed,ast2400-wdt";
 				reg = <0x1e785020 0x1c>;
-				status = "disabled";
 			};
 
 			vuart: serial@1e787000 {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 71e1264b81aa..ca023e9ab0b8 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -256,7 +256,6 @@ wdt1: watchdog@1e785000 {
 			wdt2: watchdog@1e785020 {
 				compatible = "aspeed,ast2500-wdt";
 				reg = <0x1e785020 0x20>;
-				status = "disabled";
 			};
 
 			wdt3: watchdog@1e785040 {