On Wed, 2017-10-04 at 19:46 +1030, Joel Stanley wrote: > 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. > > Signed-off-by: Joel Stanley <joel@xxxxxxxxx> Reviewed-by: Andrew Jeffery <andrew@xxxxxxxx> > --- > arch/arm/boot/dts/aspeed-g4.dtsi | 1 - > arch/arm/boot/dts/aspeed-g5.dtsi | 1 - > 2 files changed, 2 deletions(-) > > 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 @@ > 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 @@ > wdt2: watchdog@1e785020 { > compatible = "aspeed,ast2500-wdt"; > reg = <0x1e785020 0x20>; > - status = "disabled"; > }; > > wdt3: watchdog@1e785040 {
Attachment:
signature.asc
Description: This is a digitally signed message part