From: viresh.kumar@linaro.org (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 14/14] watchdog/mpcore_wdt: Add DT probing support for ARM mpcore watchdog
Date: Tue, 18 Jun 2013 20:50:38 +0530 [thread overview]
Message-ID: <51fb528c67247ea5ef6c66650f6adf7a2a21bc81.1371535243.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1371535241.git.viresh.kumar@linaro.org>
This patch adds Device tree probing support for ARM Mpcore watchdog. Its binding
were already documented in Documentation/devicetree/bindings/arm/twd.txt.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/watchdog/mpcore_wdt.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index d7ee4eb..50f5a0b 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -27,6 +27,7 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/reboot.h>
@@ -403,6 +404,16 @@ static SIMPLE_DEV_PM_OPS(mpcore_wdt_dev_pm_ops, mpcore_wdt_suspend,
/* work with hotplug and coldplug */
MODULE_ALIAS("platform:mpcore_wdt");
+#ifdef CONFIG_OF
+static const struct of_device_id mpcore_wdt_id_table[] = {
+ { .compatible = "arm,cortex-a9-twd-wdt" },
+ { .compatible = "arm,cortex-a5-twd-wdt" },
+ { .compatible = "arm,arm11mp-twd-wdt" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, mpcore_wdt_id_table);
+#endif
+
static struct platform_driver mpcore_wdt_driver = {
.probe = mpcore_wdt_probe,
.remove = mpcore_wdt_remove,
@@ -411,6 +422,7 @@ static struct platform_driver mpcore_wdt_driver = {
.owner = THIS_MODULE,
.name = "mpcore_wdt",
.pm = &mpcore_wdt_dev_pm_ops,
+ .of_match_table = of_match_ptr(mpcore_wdt_id_table),
},
};
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2013-06-18 15:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 15:20 [PATCH V3 00/14] watchdog: ARM mpcore Improvements Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 01/14] watchdog/mpcore_wdt: Mark it as BROKEN Viresh Kumar
2013-06-18 15:42 ` Guenter Roeck
2013-06-18 16:11 ` Marc Zyngier
2013-06-18 16:35 ` Olof Johansson
2013-06-19 3:10 ` Viresh Kumar
2013-06-19 7:56 ` Marc Zyngier
2013-06-19 8:15 ` Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 02/14] watchdog/mpcore_wdt: convert to watchdog core Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 03/14] watchdog/mpcore_wdt: Fix multiline comments Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 04/14] watchdog/mpcore_wdt: Arrange #includes in alphabetical order Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 05/14] watchdog/mpcore_wdt: Set default heartbeat in probe instead of init Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 06/14] watchdog/mpcore_wdt: convert to use module_platform_driver() Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 07/14] watchdog/mpcore_wdt: Add support for dev_pm_ops interface Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 08/14] watchdog/mpcore_wdt: disable wdt in suspend only if it is busy Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 09/14] watchdog/mpcore_wdt: replace (__raw_)readl/writel with lighter *_relaxed variants Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 10/14] watchdog/mpcore_wdt: Add support for WDIOC_GETBOOTSTATUS IOCTL Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 11/14] watchdog/mpcore_wdt: Add clock framework support Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 12/14] watchdog/mpcore_wdt: use correct clk_rate to program timeout Viresh Kumar
2013-06-18 15:20 ` [PATCH V3 13/14] watchdog/mpcore_wdt: Start registers from 0x00 instead of 0x20 Viresh Kumar
2013-06-18 15:20 ` Viresh Kumar [this message]
2013-06-18 16:03 ` [PATCH V3 00/14] watchdog: ARM mpcore Improvements Russell King - ARM Linux
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=51fb528c67247ea5ef6c66650f6adf7a2a21bc81.1371535243.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).