From: Felipe Balbi <balbi@ti.com> To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> Cc: <linux-watchdog@vger.kernel.org>, Wim Van Sebroeck <wim@iguana.be>, Lokesh Vutla <lokeshvutla@ti.com>, Felipe Balbi <balbi@ti.com>, <kernel@pengutronix.de>, Linux OMAP Mailing List <linux-omap@vger.kernel.org> Subject: Re: [PATCH 1/3] watchdog: omap: use watchdog_init_timeout Date: Fri, 24 Apr 2015 09:42:59 -0500 [thread overview] Message-ID: <20150424144259.GB5692@saruman.tx.rr.com> (raw) In-Reply-To: <1429868913-24049-2-git-send-email-u.kleine-koenig@pengutronix.de> [-- Attachment #1: Type: text/plain, Size: 2139 bytes --] Hi, On Fri, Apr 24, 2015 at 11:48:31AM +0200, Uwe Kleine-König wrote: > Instead of (partly) open coding it use the core function. As a side > effect the "timeout-sec" devicetree property is used now. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > Documentation/devicetree/bindings/watchdog/omap-wdt.txt | 9 +++++---- > drivers/watchdog/omap_wdt.c | 5 +---- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > index c227970671ea..4f18ec38be2f 100644 > --- a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > @@ -1,10 +1,11 @@ > TI Watchdog Timer (WDT) Controller for OMAP > > Required properties: > -compatible: > -- "ti,omap3-wdt" for OMAP3 > -- "ti,omap4-wdt" for OMAP4 > -- ti,hwmods: Name of the hwmod associated to the WDT > +- compatible : "ti,omap3-wdt" (for OMAP3) or "ti,omap4-wdt" (for OMAP4) > +- ti,hwmods : Name of the hwmod associated to the WDT > + > +Optional properties: > +- timeout-sec : default watchdog timeout in seconds adding a new property here ? Why ? In fact, none of these DT binding doc changes fit in $subject. Sure, watchdog_init_timeout() needs timeout-sec, but no OMAP DT today passes it. > diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c > index 39a6cfcba016..0eb9ca04e672 100644 > --- a/drivers/watchdog/omap_wdt.c > +++ b/drivers/watchdog/omap_wdt.c > @@ -234,10 +234,7 @@ static int omap_wdt_probe(struct platform_device *pdev) > omap_wdt->min_timeout = TIMER_MARGIN_MIN; > omap_wdt->max_timeout = TIMER_MARGIN_MAX; > > - if (timer_margin >= TIMER_MARGIN_MIN && > - timer_margin <= TIMER_MARGIN_MAX) > - omap_wdt->timeout = timer_margin; > - else > + if (watchdog_init_timeout(omap_wdt, timer_margin, &pdev->dev) < 0) > omap_wdt->timeout = TIMER_MARGIN_DEFAULT; > > watchdog_set_drvdata(omap_wdt, wdev); > -- > 2.1.4 > -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org> To: "Uwe Kleine-König" <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Wim Van Sebroeck <wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org>, Lokesh Vutla <lokeshvutla-l0cyMroinI0@public.gmane.org>, Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>, kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, Linux OMAP Mailing List <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> Subject: Re: [PATCH 1/3] watchdog: omap: use watchdog_init_timeout Date: Fri, 24 Apr 2015 09:42:59 -0500 [thread overview] Message-ID: <20150424144259.GB5692@saruman.tx.rr.com> (raw) In-Reply-To: <1429868913-24049-2-git-send-email-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> [-- Attachment #1: Type: text/plain, Size: 2164 bytes --] Hi, On Fri, Apr 24, 2015 at 11:48:31AM +0200, Uwe Kleine-König wrote: > Instead of (partly) open coding it use the core function. As a side > effect the "timeout-sec" devicetree property is used now. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> > --- > Documentation/devicetree/bindings/watchdog/omap-wdt.txt | 9 +++++---- > drivers/watchdog/omap_wdt.c | 5 +---- > 2 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > index c227970671ea..4f18ec38be2f 100644 > --- a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > +++ b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt > @@ -1,10 +1,11 @@ > TI Watchdog Timer (WDT) Controller for OMAP > > Required properties: > -compatible: > -- "ti,omap3-wdt" for OMAP3 > -- "ti,omap4-wdt" for OMAP4 > -- ti,hwmods: Name of the hwmod associated to the WDT > +- compatible : "ti,omap3-wdt" (for OMAP3) or "ti,omap4-wdt" (for OMAP4) > +- ti,hwmods : Name of the hwmod associated to the WDT > + > +Optional properties: > +- timeout-sec : default watchdog timeout in seconds adding a new property here ? Why ? In fact, none of these DT binding doc changes fit in $subject. Sure, watchdog_init_timeout() needs timeout-sec, but no OMAP DT today passes it. > diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c > index 39a6cfcba016..0eb9ca04e672 100644 > --- a/drivers/watchdog/omap_wdt.c > +++ b/drivers/watchdog/omap_wdt.c > @@ -234,10 +234,7 @@ static int omap_wdt_probe(struct platform_device *pdev) > omap_wdt->min_timeout = TIMER_MARGIN_MIN; > omap_wdt->max_timeout = TIMER_MARGIN_MAX; > > - if (timer_margin >= TIMER_MARGIN_MIN && > - timer_margin <= TIMER_MARGIN_MAX) > - omap_wdt->timeout = timer_margin; > - else > + if (watchdog_init_timeout(omap_wdt, timer_margin, &pdev->dev) < 0) > omap_wdt->timeout = TIMER_MARGIN_DEFAULT; > > watchdog_set_drvdata(omap_wdt, wdev); > -- > 2.1.4 > -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-04-24 14:44 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-24 9:48 [PATCH 0/3] watchdog: omap: several cleanups Uwe Kleine-König 2015-04-24 9:48 ` [PATCH 1/3] watchdog: omap: use watchdog_init_timeout Uwe Kleine-König 2015-04-24 14:42 ` Felipe Balbi [this message] 2015-04-24 14:42 ` Felipe Balbi 2015-04-24 19:02 ` Uwe Kleine-König 2015-04-24 19:02 ` Uwe Kleine-König 2015-04-24 20:20 ` [PATCH 1a/3] watchdog: omap: clearify device tree documentation Uwe Kleine-König 2015-04-24 20:20 ` Uwe Kleine-König 2015-04-25 2:10 ` Felipe Balbi 2015-04-25 2:10 ` Felipe Balbi 2015-04-26 15:29 ` Guenter Roeck 2015-04-26 15:29 ` Guenter Roeck 2015-04-26 19:12 ` Uwe Kleine-König 2015-04-26 19:12 ` Uwe Kleine-König 2015-04-26 19:46 ` Guenter Roeck 2015-04-26 19:46 ` Guenter Roeck 2015-04-24 9:48 ` [PATCH 2/3] watchdog: omap: put struct watchdog_device into driver data Uwe Kleine-König 2015-04-24 14:44 ` Felipe Balbi 2015-04-24 14:44 ` Felipe Balbi 2015-04-24 19:10 ` Uwe Kleine-König 2015-04-24 19:10 ` Uwe Kleine-König 2015-04-24 9:48 ` [PATCH 3/3] watchdog: omap: simplify assignment of bootstatus Uwe Kleine-König 2015-04-24 14:45 ` Felipe Balbi 2015-04-24 14:45 ` Felipe Balbi 2015-04-24 19:03 ` Uwe Kleine-König 2015-04-26 15:28 ` Guenter Roeck 2015-04-26 19:14 ` Uwe Kleine-König
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150424144259.GB5692@saruman.tx.rr.com \ --to=balbi@ti.com \ --cc=kernel@pengutronix.de \ --cc=linux-omap@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=lokeshvutla@ti.com \ --cc=u.kleine-koenig@pengutronix.de \ --cc=wim@iguana.be \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.