From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752714AbbAMOYO (ORCPT ); Tue, 13 Jan 2015 09:24:14 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:38356 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752396AbbAMOYK (ORCPT ); Tue, 13 Jan 2015 09:24:10 -0500 Date: Tue, 13 Jan 2015 06:23:41 -0800 From: Guenter Roeck To: Lee Jones Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, wim@iguana.be, linux-watchdog@vger.kernel.org, kernel@stlinux.com, David Paris Subject: Re: [4/4] watchdog: st_wdt: Add new driver for ST's LPC Watchdog Message-ID: <20150113142341.GA15707@roeck-us.net> References: <1414077524-6469-5-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414077524-6469-5-git-send-email-lee.jones@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020201.54B52A89.02FA,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 23, 2014 at 04:18:44PM +0100, Lee Jones wrote: > Signed-off-by: David Paris > Signed-off-by: Lee Jones Digging myself out of my hole. Sorry for the laaaate reply. > --- > drivers/watchdog/Kconfig | 16 +++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/st_wdt.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 334 insertions(+) > create mode 100644 drivers/watchdog/st_wdt.c > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index f57312f..c8abf57 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -432,6 +432,22 @@ config SIRFSOC_WATCHDOG > Support for CSR SiRFprimaII and SiRFatlasVI watchdog. When > the watchdog triggers the system will be reset. > > +config ST_WATCHDOG > + tristate "STMicroelectronics LPC Watchdog" > + depends on ARCH_STI && OF > + depends on !RTC_DRV_ST_LPC RTC_DRV_ST_LPC is not in mainline nor in -next. Is this still current ? > + select WATCHDOG_CORE > + help > + Say Y here to include Watchdog timer support for the watchdog > + existing in the LPC of STMicroelectronics SOCs. > + !!! BE CARREFUL !!! > + This driver shares hardware resources with RTC Alarm part of the > + LPC. Both LPC Watchdog driver and LPC RTC driver cannot be > + used together. > + Arnd has asked if/how this is enforced by the code. Was this ever resolved ? > + To compile this driver as a module, choose M here: the > + module will be called st-wdt. > + [ ... ] > + watchdog_set_drvdata(&st_wdog_dev, st_wdog); > + watchdog_set_nowayout(&st_wdog_dev, WATCHDOG_NOWAYOUT); > + > + /* Init Watchdog timeout with value in DT */ > + ret = watchdog_init_timeout(&st_wdog_dev, 0, &pdev->dev); > + if (ret) { > + dev_err(&pdev->dev, "Unable to initialise watchdog timeout\n"); Missing clk_disable_unprepare(). > + return ret; > + } > + > + ret = watchdog_register_device(&st_wdog_dev); > + if (ret) { > + dev_err(&pdev->dev, "Unable to register watchdog\n"); > + clk_disable_unprepare(clk); > + return ret; > + } > + > + st_wdog_setup(st_wdog, true); > + > + dev_info(&pdev->dev, "LPC Watchdog driver registered, reset type is %s", > + st_wdog->warm_reset ? "warm" : "cold"); Missing newline. Guenter