From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from devils.ext.ti.com ([198.47.26.153]:57511 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561Ab3KYOyR (ORCPT ); Mon, 25 Nov 2013 09:54:17 -0500 Message-ID: <52936451.1020406@ti.com> Date: Mon, 25 Nov 2013 16:53:05 +0200 From: "ivan.khoronzhuk" MIME-Version: 1.0 To: Santosh Shilimkar CC: , , , , , , Pawel Moll , , , , , , , , Ivan Khoronzhuk Subject: Re: [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch References: <1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com> In-Reply-To: <1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org 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 > Acked-by: Santosh Shilimkar > Reviewed-by: Guenter Roeck > --- > .../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 -- Regards, Ivan Khoronzhuk From mboxrd@z Thu Jan 1 00:00:00 1970 From: ivan.khoronzhuk@ti.com (ivan.khoronzhuk) Date: Mon, 25 Nov 2013 16:53:05 +0200 Subject: [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch In-Reply-To: <1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com> References: <1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com> Message-ID: <52936451.1020406@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Acked-by: Santosh Shilimkar > Reviewed-by: Guenter Roeck > --- > .../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 at 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 -- Regards, Ivan Khoronzhuk From mboxrd@z Thu Jan 1 00:00:00 1970 From: "ivan.khoronzhuk" Subject: Re: [PATCH v3 5/6] watchdog: davinci: reuse driver for keystone arch Date: Mon, 25 Nov 2013 16:53:05 +0200 Message-ID: <52936451.1020406@ti.com> References: <1385388498-12448-1-git-send-email-ivan.khoronzhuk@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1385388498-12448-1-git-send-email-ivan.khoronzhuk-l0cyMroinI0@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Santosh Shilimkar Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org, nsekhar-l0cyMroinI0@public.gmane.org, linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Pawel Moll , swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org, galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org, rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, grygorii.strashko-l0cyMroinI0@public.gmane.org, Ivan Khoronzhuk List-Id: devicetree@vger.kernel.org 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 > Acked-by: Santosh Shilimkar > Reviewed-by: Guenter Roeck > --- > .../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 -- Regards, Ivan Khoronzhuk -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html