From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751904Ab3KSFQR (ORCPT ); Tue, 19 Nov 2013 00:16:17 -0500 Received: from mail.active-venture.com ([67.228.131.205]:61431 "EHLO mail.active-venture.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750823Ab3KSFQP (ORCPT ); Tue, 19 Nov 2013 00:16:15 -0500 X-Originating-IP: 108.223.40.66 Message-ID: <528AF41D.4010306@roeck-us.net> Date: Mon, 18 Nov 2013 21:16:13 -0800 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Ivan Khoronzhuk , Santosh Shilimkar , Wim Van Sebroeck , Sekhar Nori , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org CC: Grant Likely , Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Kumar Gala , Ian Campbell , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Strashko Grygorii Subject: Re: [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch References: <1384795139-19466-1-git-send-email-ivan.khoronzhuk@ti.com> <1384795139-19466-6-git-send-email-ivan.khoronzhuk@ti.com> In-Reply-To: <1384795139-19466-6-git-send-email-ivan.khoronzhuk@ti.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote: > The keystone arch use 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 | 11 +++++++++-- > drivers/watchdog/Kconfig | 4 ++-- > drivers/watchdog/davinci_wdt.c | 3 ++- > 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..0f1aa99 100644 > --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt > @@ -1,16 +1,23 @@ > -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 > +- clocks : phandle reference to the controller clock. > + Required only for Keystone arch. See clock-bindings.txt > > Optional properties: > - timeout-sec : Contains the watchdog timeout in seconds > > +Documentation: > +Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf > +Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf > + > Examples: > > 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 d7db13d..addfc2c 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 55deaf8..a6d365a 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 = { > @@ -212,6 +212,7 @@ static int davinci_wdt_remove(struct platform_device *pdev) > > static const struct of_device_id davinci_wdt_of_match[] = { > { .compatible = "ti,davinci-wdt", }, > + { .compatible = "ti,keystone-wdt", }, > {}, > }; > MODULE_DEVICE_TABLE(of, davinci_wdt_of_match); >