linux-watchdog.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
	Dirk Eibach <dirk.eibach@gdsys.cc>
Subject: [RFC PATCH 2/2] watchdog: booke: Add device tree support
Date: Fri,  3 May 2013 08:56:46 -0700	[thread overview]
Message-ID: <1367596606-22476-2-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1367596606-22476-1-git-send-email-linux@roeck-us.net>

Enable timeout initialization from device tree data.

Cc: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
Compile tested only. Need to determine final "compatible" strings
documentation of properties.

 drivers/watchdog/booke_wdt.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 9b066b9..d433675 100644
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -18,6 +18,7 @@
 #include <linux/smp.h>
 #include <linux/watchdog.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 
 #include <asm/reg_booke.h>
 #include <asm/time.h>
@@ -238,8 +239,10 @@ static int booke_wdt_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, "powerpc book-e watchdog driver loaded\n");
 
 	booke_wdt_info.firmware_version = cur_cpu_spec->pvr_value;
-	booke_wdt_set_timeout(&booke_wdt_dev,
-			      period_to_sec(CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT));
+	watchdog_init_timeout(&booke_wdt_dev,
+			      period_to_sec(CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT),
+			      &pdev->dev);
+	booke_wdt_set_timeout(&booke_wdt_dev, booke_wdt_dev.timeout);
 	watchdog_set_nowayout(&booke_wdt_dev, nowayout);
 	if (booke_wdt_enabled)
 		__booke_wdt_start(&booke_wdt_dev);
@@ -249,6 +252,13 @@ static int booke_wdt_probe(struct platform_device *pdev)
 	return ret;
 }
 
+static const struct of_device_id booke_wdt_of_match[] = {
+	{ .compatible = "booke_wdt", },
+	{ .compatible = "fsl,booke-wdt", },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, booke_wdt_of_match);
+
 static struct platform_driver booke_wdt_driver = {
 	.probe = booke_wdt_probe,
 	.remove = booke_wdt_remove,
@@ -256,6 +266,7 @@ static struct platform_driver booke_wdt_driver = {
 	.driver = {
 		.owner  = THIS_MODULE,
 		.name = "booke_wdt",
+		.of_match_table = booke_wdt_of_match,
 	},
 };
 
-- 
1.7.9.7


      reply	other threads:[~2013-05-03 15:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-03 15:56 [RFC PATCH 1/2] watchdog: booke: Convert to platform driver Guenter Roeck
2013-05-03 15:56 ` Guenter Roeck [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1367596606-22476-2-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=dirk.eibach@gdsys.cc \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).