diff options
author | Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> | 2013-12-04 14:39:30 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2014-01-28 15:20:05 -0500 |
commit | 8832b20093434514fda5e8a0c885270eda4fbf40 (patch) | |
tree | f7c738b839bab14d086443d498e99a9683290a9e /drivers/watchdog | |
parent | 4fa5daa9c618e3411a351c326c34916b65ee7ae6 (diff) |
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: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/Kconfig | 4 | ||||
-rw-r--r-- | drivers/watchdog/davinci_wdt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b69a0f763a6d..af8f7c75e03c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -270,11 +270,11 @@ config IOP_WATCHDOG | |||
270 | 270 | ||
271 | config DAVINCI_WATCHDOG | 271 | config DAVINCI_WATCHDOG |
272 | tristate "DaVinci watchdog" | 272 | tristate "DaVinci watchdog" |
273 | depends on ARCH_DAVINCI | 273 | depends on ARCH_DAVINCI || ARCH_KEYSTONE |
274 | select WATCHDOG_CORE | 274 | select WATCHDOG_CORE |
275 | help | 275 | help |
276 | Say Y here if to include support for the watchdog timer | 276 | Say Y here if to include support for the watchdog timer |
277 | in the DaVinci DM644x/DM646x processors. | 277 | in the DaVinci DM644x/DM646x or Keystone processors. |
278 | To compile this driver as a module, choose M here: the | 278 | To compile this driver as a module, choose M here: the |
279 | module will be called davinci_wdt. | 279 | module will be called davinci_wdt. |
280 | 280 | ||
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index dbe28343e749..b1bae03742a9 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) | |||
143 | 143 | ||
144 | static const struct watchdog_info davinci_wdt_info = { | 144 | static const struct watchdog_info davinci_wdt_info = { |
145 | .options = WDIOF_KEEPALIVEPING, | 145 | .options = WDIOF_KEEPALIVEPING, |
146 | .identity = "DaVinci Watchdog", | 146 | .identity = "DaVinci/Keystone Watchdog", |
147 | }; | 147 | }; |
148 | 148 | ||
149 | static const struct watchdog_ops davinci_wdt_ops = { | 149 | static const struct watchdog_ops davinci_wdt_ops = { |