Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8832b200 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Wim Van Sebroeck
Browse files

watchdog: davinci: reuse driver for keystone arch 



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: default avatarIvan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 4fa5daa9

Documentation/devicetree/bindings/watchdog/davinci-wdt.txt

+10 −2
Original line number Diff line number Diff line 
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", "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>;

};

drivers/watchdog/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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.

drivers/watchdog/davinci_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {