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

Commit c1fd5f64 authored by Fabio Porcedda's avatar Fabio Porcedda Committed by Wim Van Sebroeck
Browse files

watchdog: add timeout-sec property binding 



this patchset add the timeout-sec property to the following drivers:
orion_wdt, pnx4008_wdt, s3c2410_wdt and at91sam9_wdt.

The at91sam9_wdt is tested on evk-pr3,
the other drivers are compile tested only.

Signed-off-by: default avatarFabio Porcedda <fabio.porcedda@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Masanari Iida <standby24x7@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 490ac7af

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ Required properties: 
- reg: physical base address of the controller and length of memory mapped

  region.



Optional properties:

- timeout-sec: contains the watchdog timeout in seconds.



Example:



	watchdog@fffffd40 {

		compatible = "atmel,at91sam9260-wdt";

		reg = <0xfffffd40 0x10>;

		timeout-sec = <10>;

	};

Documentation/devicetree/bindings/watchdog/marvel.txt

+5 −0
Original line number Diff line number Diff line
@@ -5,10 +5,15 @@ Required Properties: 
- Compatibility : "marvell,orion-wdt"

- reg		: Address of the timer registers



Optional properties:



- timeout-sec	: Contains the watchdog timeout in seconds



Example:



	wdt@20300 {

		compatible = "marvell,orion-wdt";

		reg = <0x20300 0x28>;

		timeout-sec = <10>;

		status = "okay";

	};

Documentation/devicetree/bindings/watchdog/pnx4008-wdt.txt

+4 −0
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ Required properties: 
- reg: physical base address of the controller and length of memory mapped

  region.



Optional properties:

- timeout-sec: contains the watchdog timeout in seconds.



Example:



	watchdog@4003C000 {

		compatible = "nxp,pnx4008-wdt";

		reg = <0x4003C000 0x1000>;

		timeout-sec = <10>;

	};

Documentation/devicetree/bindings/watchdog/samsung-wdt.txt

+3 −0
Original line number Diff line number Diff line
@@ -9,3 +9,6 @@ Required properties: 
- reg : base physical address of the controller and length of memory mapped

	region.

- interrupts : interrupt number to the cpu.



Optional properties:

- timeout-sec : contains the watchdog timeout in seconds.

drivers/watchdog/at91sam9_wdt.c

+4 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 


/* User land timeout */

#define WDT_HEARTBEAT 15

static int heartbeat = WDT_HEARTBEAT;

static int heartbeat;

module_param(heartbeat, int, 0);

MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "

	"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
@@ -176,6 +176,7 @@ static const struct watchdog_ops at91_wdt_ops = { 
static struct watchdog_device at91_wdt_dev = {

	.info =		&at91_wdt_info,

	.ops =		&at91_wdt_ops,

	.timeout =	WDT_HEARTBEAT,

	.min_timeout =	1,

	.max_timeout =	0xFFFF,

};
@@ -194,8 +195,8 @@ static int __init at91wdt_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	at91_wdt_dev.timeout = heartbeat;

	at91_wdt_dev.parent = &pdev->dev;

	watchdog_init_timeout(&at91_wdt_dev, heartbeat, &pdev->dev);

	watchdog_set_nowayout(&at91_wdt_dev, nowayout);



	/* Set watchdog */
@@ -212,7 +213,7 @@ static int __init at91wdt_probe(struct platform_device *pdev) 
	mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);



	pr_info("enabled (heartbeat=%d sec, nowayout=%d)\n",

		heartbeat, nowayout);

		at91_wdt_dev.timeout, nowayout);



	return 0;

}