From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Thu, 25 Oct 2012 12:56:22 +0200 Subject: [U-Boot] [PATCH V3 1/1] mx31/mx35/mx51/mx53/mx6: add watchdog In-Reply-To: <1350955141-15642-1-git-send-email-troy.kisky@boundarydevices.com> References: <5041C06B.1080509@denx.de> <1350955141-15642-1-git-send-email-troy.kisky@boundarydevices.com> Message-ID: <50891AD6.5090001@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 23/10/2012 03:19, schrieb Troy Kisky: > Use a common watchdog driver for all these cpus. > > Signed-off-by: Troy Kisky > > --- Hi Troy, > +++ b/doc/README.watchdog > @@ -0,0 +1,29 @@ > +Watchdog driver general info > + > +CONFIG_HW_WATCHDOG > + This enables hw_watchdog_reset to be called during various loops, > + including waiting for a character on a serial port. But it > + does not also call hw_watchdog_init. Boards which want this > + enabled must call this function in their board file. This split > + is useful because some rom's enable the watchdog when downloading > + new code, so it must be serviced, but the board would rather it > + was off. And, it cannot always be turned off once on. > + > +CONFIG_WATCHDOG_TIMEOUT_MSECS > + Can be used to change the timeout for i.mx31/35/5x/6x. > + If not given, will default to maximum timeout. This would > + be 128000 msec for i.mx31/35/5x/6x. > + > +CONFIG_AT91SAM9_WATCHDOG > + Available for AT91SAM9 to service the watchdog. > + > +CONFIG_FTWDT010_WATCHDOG > + Available for FTWDT010 to service the watchdog. > + > +CONFIG_FTWDT010_HW_TIMEOUT > + Can be used to change the timeout for FTWDT010. > + > +CONFIG_IMX_WATCHDOG > + Available for i.mx31/35/5x/6x to service the watchdog. This is not > + automatically set because some boards (vision2) still need to define > + their own hw_watchdog_reset routine. Thanks for documenting also not i.MX drivers. > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile > index 5579bf2..18768b7 100644 > --- a/drivers/watchdog/Makefile > +++ b/drivers/watchdog/Makefile > @@ -27,6 +27,9 @@ LIB := $(obj)libwatchdog.o > > COBJS-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o > COBJS-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o > +ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6)) > +COBJS-y += imx_watchdog.o > +endif IMHO I like this solution, also if this driver is always compiled independently if CONFIG_IMX_WATCHDOG is set, so to link the reset() function. In any case, there is not a bigger footprint because you protect watchdog code with the switch. Here my: Acked-by: Stefano Babic I will just wait a bit for further comment before merging. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================