| Message ID | 20180209192724.1227-7-marcus.folkesson@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Feb 09, 2018 at 08:27:23PM +0100, Marcus Folkesson wrote: > watchdog_init_timeout() will allways pick timeout_param since it > defaults to a valid timeout. > > By following best practice described in > Documentation/watchdog/watchdog-kernel-api.txt, it also > let us to set timout-sec property in devicetree. > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> Reviewed-by: Guenetr Roeck <linux@roeck-us.net> > --- > Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 4 ++++ > drivers/watchdog/meson_wdt.c | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > index 8a6d84cb36c9..7588cc3971bf 100644 > --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > @@ -9,9 +9,13 @@ Required properties: > "amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs > - reg : Specifies base physical address and size of the registers. > > +Optional properties: > +- timeout-sec: contains the watchdog timeout in seconds. > + > Example: > > wdt: watchdog@c1109900 { > compatible = "amlogic,meson6-wdt"; > reg = <0xc1109900 0x8>; > + timeout-sec = <10>; > }; > diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c > index 304274c67735..cd0275a6cdac 100644 > --- a/drivers/watchdog/meson_wdt.c > +++ b/drivers/watchdog/meson_wdt.c > @@ -36,7 +36,7 @@ > #define MESON_SEC_TO_TC(s, c) ((s) * (c)) > > static bool nowayout = WATCHDOG_NOWAYOUT; > -static unsigned int timeout = MESON_WDT_TIMEOUT; > +static unsigned int timeout; > > struct meson_wdt_data { > unsigned int enable; > -- > 2.15.1 >
Hi Guenter, On 09/02/2018 at 14:48:49 -0800, Guenter Roeck wrote: > On Fri, Feb 09, 2018 at 08:27:23PM +0100, Marcus Folkesson wrote: > > watchdog_init_timeout() will allways pick timeout_param since it > > defaults to a valid timeout. > > > > By following best practice described in > > Documentation/watchdog/watchdog-kernel-api.txt, it also > > let us to set timout-sec property in devicetree. > > > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > > Reviewed-by: Guenetr Roeck <linux@roeck-us.net> ^ A small typo in your name > > --- > > Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 4 ++++ > > drivers/watchdog/meson_wdt.c | 2 +- > > 2 files changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > > index 8a6d84cb36c9..7588cc3971bf 100644 > > --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > > +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt > > @@ -9,9 +9,13 @@ Required properties: > > "amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs > > - reg : Specifies base physical address and size of the registers. > > > > +Optional properties: > > +- timeout-sec: contains the watchdog timeout in seconds. > > + > > Example: > > > > wdt: watchdog@c1109900 { > > compatible = "amlogic,meson6-wdt"; > > reg = <0xc1109900 0x8>; > > + timeout-sec = <10>; > > }; > > diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c > > index 304274c67735..cd0275a6cdac 100644 > > --- a/drivers/watchdog/meson_wdt.c > > +++ b/drivers/watchdog/meson_wdt.c > > @@ -36,7 +36,7 @@ > > #define MESON_SEC_TO_TC(s, c) ((s) * (c)) > > > > static bool nowayout = WATCHDOG_NOWAYOUT; > > -static unsigned int timeout = MESON_WDT_TIMEOUT; > > +static unsigned int timeout; > > > > struct meson_wdt_data { > > unsigned int enable; > > -- > > 2.15.1 > >
On Sat, Feb 10, 2018 at 12:19:10AM +0100, Alexandre Belloni wrote: > Hi Guenter, > > On 09/02/2018 at 14:48:49 -0800, Guenter Roeck wrote: > > On Fri, Feb 09, 2018 at 08:27:23PM +0100, Marcus Folkesson wrote: > > > watchdog_init_timeout() will allways pick timeout_param since it > > > defaults to a valid timeout. > > > > > > By following best practice described in > > > Documentation/watchdog/watchdog-kernel-api.txt, it also > > > let us to set timout-sec property in devicetree. > > > > > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > > > > Reviewed-by: Guenetr Roeck <linux@roeck-us.net> > ^ > A small typo in your name > Mr. Fat Fingers At Work :-) Guenter
diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt index 8a6d84cb36c9..7588cc3971bf 100644 --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt @@ -9,9 +9,13 @@ Required properties: "amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs - reg : Specifies base physical address and size of the registers. +Optional properties: +- timeout-sec: contains the watchdog timeout in seconds. + Example: wdt: watchdog@c1109900 { compatible = "amlogic,meson6-wdt"; reg = <0xc1109900 0x8>; + timeout-sec = <10>; }; diff --git a/drivers/watchdog/meson_wdt.c b/drivers/watchdog/meson_wdt.c index 304274c67735..cd0275a6cdac 100644 --- a/drivers/watchdog/meson_wdt.c +++ b/drivers/watchdog/meson_wdt.c @@ -36,7 +36,7 @@ #define MESON_SEC_TO_TC(s, c) ((s) * (c)) static bool nowayout = WATCHDOG_NOWAYOUT; -static unsigned int timeout = MESON_WDT_TIMEOUT; +static unsigned int timeout; struct meson_wdt_data { unsigned int enable;
watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout. By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree. Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> --- Documentation/devicetree/bindings/watchdog/meson-wdt.txt | 4 ++++ drivers/watchdog/meson_wdt.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)