]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: aspeed: Enable watchdog two
authorJoel Stanley <joel@jms.id.au>
Wed, 4 Oct 2017 09:16:35 +0000 (19:46 +1030)
committerJoel Stanley <joel@jms.id.au>
Thu, 5 Oct 2017 06:00:12 +0000 (16:30 +1030)
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>
arch/arm/boot/dts/aspeed-g4.dtsi
arch/arm/boot/dts/aspeed-g5.dtsi

index 5be2e6a39917d121b22015588221b9739f455329..9bf84d2ba038ccbe351508b09f21fca42114c6e1 100644 (file)
@@ -212,7 +212,6 @@ wdt1: watchdog@1e785000 {
                        wdt2: watchdog@1e785020 {
                                compatible = "aspeed,ast2400-wdt";
                                reg = <0x1e785020 0x1c>;
-                               status = "disabled";
                        };
 
                        vuart: serial@1e787000 {
index 71e1264b81aa91b78ac4acec56c2a9c7e0d22413..ca023e9ab0b8d7ea60080100c907b508f8c61396 100644 (file)
@@ -256,7 +256,6 @@ wdt1: watchdog@1e785000 {
                        wdt2: watchdog@1e785020 {
                                compatible = "aspeed,ast2500-wdt";
                                reg = <0x1e785020 0x20>;
-                               status = "disabled";
                        };
 
                        wdt3: watchdog@1e785040 {