devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] watchdog: davinci_wdt: add OF support
@ 2012-11-26 21:41 Murali Karicheri
  2012-11-29 16:28 ` [linux-keystone] " Grant Likely
  0 siblings, 1 reply; 2+ messages in thread
From: Murali Karicheri @ 2012-11-26 21:41 UTC (permalink / raw)
  To: grant.likely, rob.herring, rob, wim, devicetree-discuss,
	linux-doc, linux-kernel, linux-watchdog, linux-keystone
  Cc: Murali Karicheri

This adds OF support for davinci_wdt driver.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
 .../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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [linux-keystone] [PATCH] watchdog: davinci_wdt: add OF support
  2012-11-26 21:41 [PATCH] watchdog: davinci_wdt: add OF support Murali Karicheri
@ 2012-11-29 16:28 ` Grant Likely
  0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2012-11-29 16:28 UTC (permalink / raw)
  To: rob.herring, rob, wim, devicetree-discuss, linux-doc,
	linux-kernel, linux-watchdog, linux-keystone
  Cc: Murali Karicheri

On Mon, 26 Nov 2012 16:41:35 -0500, Murali Karicheri <m-karicheri2@ti.com> wrote:
> This adds OF support for davinci_wdt driver.
> 
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
>  .../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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-29 16:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-26 21:41 [PATCH] watchdog: davinci_wdt: add OF support Murali Karicheri
2012-11-29 16:28 ` [linux-keystone] " Grant Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).