Thread (2 messages) 2 messages, 2 authors, 2012-11-29

Re: [linux-keystone] [PATCH] watchdog: davinci_wdt: add OF support

From: Grant Likely <hidden>
Date: 2012-11-29 16:28:18
Also in: linux-watchdog, lkml

On Mon, 26 Nov 2012 16:41:35 -0500, Murali Karicheri [off-list ref] wrote:
This adds OF support for davinci_wdt driver.

Signed-off-by: Murali Karicheri <redacted>
Acked-by: Grant Likely <redacted>
quoted hunk ↗ jump to hunk
---
 .../devicetree/bindings/watchdog/davinci-wdt.txt   |   12 ++++++++++++
 drivers/watchdog/davinci_wdt.c                     |    7 +++++++
 2 files changed, 19 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
new file mode 100644
index 0000000..75558cc
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -0,0 +1,12 @@
+DaVinci Watchdog Timer (WDT) Controller
+
+Required properties:
+- compatible : Should be "ti,davinci-wdt"
+- reg : Should contain WDT registers location and length
+
+Examples:
+
+wdt: wdt@2320000 {
+	compatible = "ti,davinci-wdt";
+	reg = <0x02320000 0x80>;
+};
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index eb44b03..c73e166 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -262,10 +262,17 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id davinci_wdt_of_match[] = {
+	{ .compatible = "ti,davinci-wdt", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
+
 static struct platform_driver platform_wdt_driver = {
 	.driver = {
 		.name = "watchdog",
 		.owner	= THIS_MODULE,
+		.of_match_table = davinci_wdt_of_match,
 	},
 	.probe = davinci_wdt_probe,
 	.remove = __devexit_p(davinci_wdt_remove),
-- 
1.7.9.5
-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help