public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

watchdog: mtk: allow setting timeout in devicetree

Browse source 
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: Guenter Roeck <linux@roeck-us.net>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Marcus Folkesson 2018-02-11 21:08:45 +01:00 • committed by Wim Van Sebroeck
parent d956aa7875
commit b82e6953ac
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
View file

@ -11,9 +11,13 @@ Required properties:
- reg : Specifies base physical address and size of the registers. - reg : Specifies base physical address and size of the registers.
Optional properties:
- timeout-sec: contains the watchdog timeout in seconds.
Example: Example:
wdt: watchdog@10000000 { wdt: watchdog@10000000 {
compatible = "mediatek,mt6589-wdt"; compatible = "mediatek,mt6589-wdt";
reg = <0x10000000 0x18>; reg = <0x10000000 0x18>;
timeout-sec = <10>;
}; };

2
drivers/watchdog/mtk_wdt.c
View file

@ -57,7 +57,7 @@
#define DRV_VERSION "1.0" #define DRV_VERSION "1.0"
static bool nowayout = WATCHDOG_NOWAYOUT; static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int timeout = WDT_MAX_TIMEOUT; static unsigned int timeout;
struct mtk_wdt_dev { struct mtk_wdt_dev {
struct watchdog_device wdt_dev; struct watchdog_device wdt_dev;