From: "ivan.khoronzhuk" <ivan.khoronzhuk@ti.com>
To: Santosh Shilimkar <santosh.shilimkar@ti.com>,
wim@iguana.be, nsekhar@ti.com, linux-watchdog@vger.kernel.org,
devicetree@vger.kernel.org
Cc: grant.likely@linaro.org, rob.herring@calxeda.com,
pawel.moll@arm.com, mark.rutland@arm.com, swarren@wwwdotorg.org,
galak@kernel.crashing.org, ijc+devicetree@hellion.org.uk,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch
Date: Wed, 6 Nov 2013 13:32:46 +0200 [thread overview]
Message-ID: <527A28DE.4030906@ti.com> (raw)
In-Reply-To: <1383680783-12114-7-git-send-email-ivan.khoronzhuk@ti.com>
The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
compatible and correct identity.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
.../devicetree/bindings/watchdog/davinci-wdt.txt | 11 +++++++++--
drivers/watchdog/Kconfig | 4 ++--
drivers/watchdog/davinci_wdt.c | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index 1668b6e..fddced9 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -1,13 +1,20 @@
-DaVinci Watchdog Timer (WDT) Controller
+Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
Required properties:
-- compatible : Should be "ti,davinci-wdt"
+
+- compatible: "ti,davinci-wdt"
+ "ti,keystone-wdt"
+
- reg : Should contain WDT registers location and length
Optional properties:
- timeout-sec: Contains the watchdog timeout in seconds
+Documentation:
+Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
+
Examples:
wdt: wdt@2320000 {
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 2c954b5..a4fe130 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -270,11 +270,11 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
- depends on ARCH_DAVINCI
+ depends on ARCH_DAVINCI || ARCH_KEYSTONE
select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
- in the DaVinci DM644x/DM646x processors.
+ in the DaVinci DM644x/DM646x or Keystone processors.
To compile this driver as a module, choose M here: the
module will be called davinci_wdt.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index a371b2d..e51fd2e 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -158,7 +158,7 @@ static unsigned int davinci_wdt_status(struct watchdog_device *wdd)
static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
- .identity = "DaVinci Watchdog",
+ .identity = "DaVinci/Keystone Watchdog",
};
static const struct watchdog_ops davinci_wdt_ops = {
@@ -229,6 +229,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
static const struct of_device_id davinci_wdt_of_match[] = {
{ .compatible = "ti,davinci-wdt", },
+ { .compatible = "ti,keystone-wdt", },
{},
};
MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
--
1.7.9.5
next parent reply other threads:[~2013-11-06 11:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1383680783-12114-7-git-send-email-ivan.khoronzhuk@ti.com>
2013-11-06 11:32 ` ivan.khoronzhuk [this message]
[not found] ` <527A28DE.4030906-l0cyMroinI0@public.gmane.org>
2013-11-12 15:40 ` Fwd: [PATCH 6/8] watchdog: davinci: reuse driver for keystone arch Santosh Shilimkar
2013-11-17 2:27 ` Guenter Roeck
[not found] ` <5288298B.1010602-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2013-11-18 15:03 ` ivan.khoronzhuk
2013-11-23 18:02 ` Arnd Bergmann
[not found] ` <201311231902.02807.arnd-r2nGTMty4D4@public.gmane.org>
2013-11-25 11:09 ` ivan.khoronzhuk
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=527A28DE.4030906@ti.com \
--to=ivan.khoronzhuk@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@kernel.crashing.org \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nsekhar@ti.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=santosh.shilimkar@ti.com \
--cc=swarren@wwwdotorg.org \
--cc=wim@iguana.be \
/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).