| Message ID | 20170619041533.26446-1-joel@jms.id.au |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Mon, Jun 19, 2017 at 1:45 PM, Joel Stanley <joel@jms.id.au> wrote: > Some versions of u-boot leave watchdog 2 running, but some do not. > In order to handle all of the u-boots in the wild, ensure Linux is > loading a driver for it. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Merged to dev-4.10. Thanks Rick for the ack. Cheers, Joel > --- > If you're on cc, please reply with an Ack so I know that this change is okay > for the platform(s) you care about. If I don't have objections by Wednesday, > I'll merge. > > arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 ++++ > arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 4 ++++ > 8 files changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts > index ff5058ee8834..9bfd5462ea9e 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts > @@ -201,3 +201,7 @@ > &pinctrl { > aspeed,external-nodes = <&gfx &lhc>; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > index 9f7098876ecb..e4e853d0f561 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > @@ -184,3 +184,7 @@ > &vuart { > status = "okay"; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > index 430622c86ef7..873e62ce6673 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts > @@ -224,3 +224,7 @@ > &vuart { > status = "okay"; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > index 8ebed01e7725..f7a7cbf77aba 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts > @@ -324,3 +324,7 @@ > &mbox { > status = "okay"; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > index dd01dfaa8509..d53dc597a0ce 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts > @@ -257,3 +257,7 @@ > &pinctrl { > aspeed,external-nodes = <&gfx &lhc>; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > index 99003b9fb54b..31315d03dfb8 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > @@ -419,3 +419,7 @@ > &pinctrl { > aspeed,external-nodes = <&gfx &lhc>; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > index 68baf3288263..ccf6cad2e382 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts > @@ -386,3 +386,7 @@ > &gfx { > status = "okay"; > }; > + > +&wdt2 { > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > index a73d33d4ce90..e609c53d58f5 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts > @@ -244,3 +244,7 @@ > &vuart { > status = "okay"; > }; > + > +&wdt2 { > + status = "okay"; > +}; > -- > 2.11.0 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts index ff5058ee8834..9bfd5462ea9e 100644 --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts @@ -201,3 +201,7 @@ &pinctrl { aspeed,external-nodes = <&gfx &lhc>; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts index 9f7098876ecb..e4e853d0f561 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts @@ -184,3 +184,7 @@ &vuart { status = "okay"; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts index 430622c86ef7..873e62ce6673 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts @@ -224,3 +224,7 @@ &vuart { status = "okay"; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index 8ebed01e7725..f7a7cbf77aba 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -324,3 +324,7 @@ &mbox { status = "okay"; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index dd01dfaa8509..d53dc597a0ce 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -257,3 +257,7 @@ &pinctrl { aspeed,external-nodes = <&gfx &lhc>; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 99003b9fb54b..31315d03dfb8 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -419,3 +419,7 @@ &pinctrl { aspeed,external-nodes = <&gfx &lhc>; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 68baf3288263..ccf6cad2e382 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -386,3 +386,7 @@ &gfx { status = "okay"; }; + +&wdt2 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts index a73d33d4ce90..e609c53d58f5 100644 --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts @@ -244,3 +244,7 @@ &vuart { status = "okay"; }; + +&wdt2 { + status = "okay"; +};
Some versions of u-boot leave watchdog 2 running, but some do not. In order to handle all of the u-boots in the wild, ensure Linux is loading a driver for it. Signed-off-by: Joel Stanley <joel@jms.id.au> --- If you're on cc, please reply with an Ack so I know that this change is okay for the platform(s) you care about. If I don't have objections by Wednesday, I'll merge. arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 4 ++++ arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 4 ++++ 8 files changed, 32 insertions(+)