| Message ID | 1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/25/2013 04:08 PM, Ivan Khoronzhuk wrote: > 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 = { > Sorry for mess, ignore this patch. Now it is in reply to Update Davinci watchdog driver
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 = {