Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f70b1454 authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Wim Van Sebroeck
Browse files

watchdog: sirfsoc: allow setting timeout in devicetree 



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: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 1d1dedc2

Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,10 +5,14 @@ Required properties: 
- reg: Address range of tick timer/WDT register set

- interrupts: interrupt number to the cpu



Optional properties:

- timeout-sec : Contains the watchdog timeout in seconds



Example:



timer@b0020000 {

	compatible = "sirf,prima2-tick";

	reg = <0xb0020000 0x1000>;

	interrupts = <0>;

	timeout-sec = <30>;

};

drivers/watchdog/sirfsoc_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#define SIRFSOC_WDT_MAX_TIMEOUT		(10 * 60)	/* 10 mins */

#define SIRFSOC_WDT_DEFAULT_TIMEOUT	30		/* 30 secs */



static unsigned int timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT;

static unsigned int timeout;

static bool nowayout = WATCHDOG_NOWAYOUT;



module_param(timeout, uint, 0);