devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch
@ 2013-11-25 14:08 Ivan Khoronzhuk
       [not found] ` <1385388498-12448-1-git-send-email-ivan.khoronzhuk-l0cyMroinI0@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-25 14:08 UTC (permalink / raw)
  To: Santosh Shilimkar
  Cc: linux-arm-kernel, mark.rutland, wim, nsekhar, linux-watchdog,
	devicetree, Pawel Moll, swarren, ijc+devicetree, galak,
	rob.herring, linux-kernel, grant.likely, grygorii.strashko,
	Ivan Khoronzhuk

The keystone arch uses the same IP watchdog, so add "ti,keystone-wdt"
compatible and correct identity.

The Keystone arch is using clocks in DT and source clock for watchdog
has to be specified, so add this to binding.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
 .../devicetree/bindings/watchdog/davinci-wdt.txt   |   12 ++++++++++--
 drivers/watchdog/Kconfig                           |    4 ++--
 drivers/watchdog/davinci_wdt.c                     |    2 +-
 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 e450134..4d89317 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -1,11 +1,18 @@
-DaVinci Watchdog Timer (WDT) Controller
+Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
 
 Required properties:
-- compatible : Should be "ti,davinci-wdt"
+- compatible : Should be "ti,davinci-wdt" or "ti,keystone-wdt"
 - reg : Should contain WDT registers location and length
 
 Optional properties:
 - timeout-sec : Contains the watchdog timeout in seconds
+- clocks : the clock feeding the watchdog timer.
+	   Needed if platform uses clocks.
+	   See clock-bindings.txt
+
+Documentation:
+Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
 
 Examples:
 
@@ -13,4 +20,5 @@ wdt: wdt@2320000 {
 	compatible = "ti,davinci-wdt";
 	reg = <0x02320000 0x80>;
 	timeout-sec = <30>;
+	clocks = <&clkwdtimer0>;
 };
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index eb8c89d..01f3f81 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -270,12 +270,12 @@ config IOP_WATCHDOG
 
 config DAVINCI_WATCHDOG
 	tristate "DaVinci watchdog"
-	depends on ARCH_DAVINCI
+	depends on ARCH_DAVINCI || ARCH_KEYSTONE
 	select WATCHDOG_CORE
 	select WATCHDOG_NOWAYOUT
 	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 d342fc2..9128c74 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -143,7 +143,7 @@ static unsigned int davinci_wdt_get_timeleft(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 = {
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH v3 0/6] Update Davinci watchdog driver
@ 2013-11-25 14:04 Ivan Khoronzhuk
  2013-11-25 14:48 ` [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
  0 siblings, 1 reply; 3+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-25 14:04 UTC (permalink / raw)
  To: Santosh Shilimkar
  Cc: mark.rutland, devicetree, grygorii.strashko, linux-watchdog,
	Pawel Moll, swarren, ijc+devicetree, nsekhar, galak, rob.herring,
	linux-kernel, wim, grant.likely, Ivan Khoronzhuk,
	linux-arm-kernel

These patches are intended to update Davinci watchdog to use WDT core
and reuse driver for keystone arch, because Keystone uses the similar
IP like Davinci.

See Documentation:
Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf

Also:
 - improved to support GET_TIMELEFT option.
 - added "clocks" and "timeout-sec" properties to DT.

Based on
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
keystone/master

v2..v3:
- watchdog: davinci: change driver to use WDT core
	removed "ti,keystone-wdt" compatible from driver
	renamed wdt device names for mach-davinci from
		"watchdog" to "davinci-wdt"

- watchdog: davinci: reuse driver for keystone arch
	moved "clocks" property under "Optional properties"
	improved decsription of "clocks" property

- arm: dts: keystone: add watchdog entry
	replaced "ti,keystone-wdt" compatible on
		 "ti,keystone-wdt","ti,davinci-wdt"

Ivan Khoronzhuk (6):
  watchdog: davinci: change driver to use WDT core
  watchdog: davinci: use davinci_wdt_device structure to hold device
    data
  watchdog: davinci: add GET_TIMELEFT option support
  watchdog: davinci: add "timeout-sec" property
  watchdog: davinci: reuse driver for keystone arch
  arm: dts: keystone: add watchdog entry

 .../devicetree/bindings/watchdog/davinci-wdt.txt   |   16 +-
 arch/arm/boot/dts/keystone.dtsi                    |    6 +
 arch/arm/mach-davinci/da8xx-dt.c                   |    2 +-
 arch/arm/mach-davinci/devices-da8xx.c              |    4 +-
 arch/arm/mach-davinci/devices.c                    |    2 +-
 drivers/watchdog/Kconfig                           |    6 +-
 drivers/watchdog/davinci_wdt.c                     |  225 +++++++++-----------
 7 files changed, 126 insertions(+), 135 deletions(-)

-- 
1.7.9.5

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-25 14:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-25 14:08 [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
     [not found] ` <1385388498-12448-1-git-send-email-ivan.khoronzhuk-l0cyMroinI0@public.gmane.org>
2013-11-25 14:53   ` ivan.khoronzhuk
  -- strict thread matches above, loose matches on Subject: below --
2013-11-25 14:04 [PATCH v3 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
2013-11-25 14:48 ` [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk

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).