| Message ID | 20170706222801.26009-1-cbostic@linux.vnet.ibm.com |
|---|---|
| State | Rejected |
| Headers | show |
On Fri, Jul 7, 2017 at 7:58 AM, Christopher Bostic <cbostic@linux.vnet.ibm.com> wrote: > Define external-signal and no system reset optional parameters > to the dev tree so that watchdog 1 can be configured for these > modes. > > Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com> Thanks, merged into dev-4.10. I tested that I could still reboot the system with the watchdog patches applied. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > index 31315d0..44dad21 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts > @@ -420,6 +420,11 @@ > aspeed,external-nodes = <&gfx &lhc>; > }; > > +&wdt1 { > + aspeed,reset-type = "none"; > + aspeed,external-signal; > +}; > + > &wdt2 { > status = "okay"; > }; > -- > 1.8.2.2 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 31315d0..44dad21 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -420,6 +420,11 @@ aspeed,external-nodes = <&gfx &lhc>; }; +&wdt1 { + aspeed,reset-type = "none"; + aspeed,external-signal; +}; + &wdt2 { status = "okay"; };
Define external-signal and no system reset optional parameters to the dev tree so that watchdog 1 can be configured for these modes. Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com> --- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 5 +++++ 1 file changed, 5 insertions(+)