Skip to contentSkip to conversation

watchdog: coh901327: devicetree support

PATCH In review Linus Walleij 3 participants 3 messages Apr 26, 2013 – May 26, 2013 1 message not in the archive

Subsystems (2)

v2 of 3 In review Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 9/23 watchdog: coh901327: devicetree support

From: Linus Walleij <[email protected]>

This adds support for probing the COH 901 327 watchdog from the device tree and also adds associated bindings.

Cc Wim Van Sebroeck <[email protected]>

---
ChangeLog v1->v2: augment driver to call watchdog_init_timeout()
so we can also set the timeout from the device tree, as per suggestion from Guenter Roeck.

Hi Wim, I'm seeking an ACK on this patch to take it into ARM SoC along with the patches making use of this new binding.

---
 .../bindings/watchdog/stericsson-coh901327.txt        | 19 +++++++++++++++++++
 drivers/watchdog/coh901327_wdt.c                      | 12 +++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/stericsson-coh901327.txt
Documentation/devicetree/bindings/watchdog/stericsson-coh901327.txt new file +19 -0
new file mode 100644
index 0000000..8ffb88e
@@ -0,0 +1,19 @@
+ST-Ericsson COH 901 327 Watchdog timer
+
+Required properties:
+- compatible: must be "stericsson,coh901327".
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: the interrupt used for the watchdog timeout warning.
+
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
+Example:
+
+watchdog: watchdog at c0012000 {
+	compatible = "stericsson,coh901327";
+	reg = <0xc0012000 0x1000>;
+	interrupts = <3>;
+	timeout-sec = <60>;
+};
drivers/watchdog/coh901327_wdt.c +9 -3
index b9b8a8b..4bd070f 100644
@@ -354,9 +354,9 @@ static int __init coh901327_probe(struct platform_device *pdev)
 
 	clk_disable(clk);
 
-	if (margin < 1 || margin > 327)
-		margin = 60;
-	coh901327_wdt.timeout = margin;
+	ret = watchdog_init_timeout(&coh901327_wdt, margin, &pdev->dev);
+	if (ret < 0)
+		coh901327_wdt.timeout = 60;
 
 	ret = watchdog_register_device(&coh901327_wdt);
 	if (ret == 0)
@@ -441,10 +441,16 @@ void coh901327_watchdog_reset(void)
 	/* Return and await doom */
 }
 
+static const struct of_device_id coh901327_dt_match[] = {
+	{ .compatible = "stericsson,coh901327" },
+	{},
+};
+
 static struct platform_driver coh901327_driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
 		.name	= "coh901327_wdog",
+		.of_match_table = coh901327_dt_match,
 	},
 	.remove		= __exit_p(coh901327_remove),
 	.suspend	= coh901327_suspend,
Signature · 1 line
1.7.11.3

A message that is not in the archive (sent off-list or not yet received): 1366986833-7158-1-git-send-email-linus.walleij-0IS4wlFg1OjSUeElwK9/[email protected]

#3 lore raw

Hi Linus,

Quoted 12 lines

From: Linus Walleij <[email protected]>

This adds support for probing the COH 901 327 watchdog from the device tree and also adds associated bindings.

Cc Wim Van Sebroeck <[email protected]>

---
ChangeLog v1->v2: augment driver to call watchdog_init_timeout()
so we can also set the timeout from the device tree, as per suggestion from Guenter Roeck.

Quoted 4 lines

Hi Wim, I'm seeking an ACK on this patch to take it into ARM SoC along with the patches making use of this new binding.
---

Indeed better to use the watchdog_init_timeout() function.
So definitely an Acked-by: Wim Van Sebroeck <wim-jhes/[email protected]> from me.

Kind regards,
Wim.