diff mbox

[2/2] ARM: dts: aspeed: Enable watchdog two

Message ID 20171004091635.12499-3-joel@jms.id.au (mailing list archive)
State New, archived
Headers show

Commit Message

Joel Stanley Oct. 4, 2017, 9:16 a.m. UTC
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@jms.id.au>
---
 arch/arm/boot/dts/aspeed-g4.dtsi | 1 -
 arch/arm/boot/dts/aspeed-g5.dtsi | 1 -
 2 files changed, 2 deletions(-)

Comments

Andrew Jeffery Oct. 4, 2017, 11:15 a.m. UTC | #1
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@jms.id.au>

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  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 {
diff mbox

Patch

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 {