All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sylvain Rochet <sylvain.rochet@finsecur.com>
To: Guenter Roeck <linux@roeck-us.net>,
	Boris BREZILLON <boris.brezillon@free-electrons.com>,
	linux-kernel@vger.kernel.org,
	Nicolas Ferre <nicolas.ferre@atmel.com>,
	Ludovic Desroches <ludovic.desroches@atmel.com>,
	linux-arm-kernel@lists.infradead.org,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Wenyou Yang <wenyou.yang@atmel.com>,
	Wim Van Sebroeck <wim@iguana.be>
Cc: Sylvain Rochet <sylvain.rochet@finsecur.com>
Subject: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first
Date: Thu,  8 Oct 2015 23:34:34 +0200	[thread overview]
Message-ID: <1444340074-15437-7-git-send-email-sylvain.rochet@finsecur.com> (raw)
In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com>

watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
property if timeout_parm is not zero. This change makes this DT property
working for the sama5d4 watchdog driver.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/sama5d4_wdt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index a49634c..2e2049b 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -222,7 +222,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 		}
 	}
 
-	ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
+	/* Try to set timeout from device tree first */
+	ret = watchdog_init_timeout(wdd, 0, &pdev->dev);
+	if (ret)
+		ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "unable to set timeout value\n");
 		return ret;
@@ -243,7 +246,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, wdt);
 
 	dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
-		 wdt_timeout, nowayout);
+		 wdd->timeout, nowayout);
 
 	return 0;
 }
-- 
2.5.1


WARNING: multiple messages have this Message-ID (diff)
From: sylvain.rochet@finsecur.com (Sylvain Rochet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first
Date: Thu,  8 Oct 2015 23:34:34 +0200	[thread overview]
Message-ID: <1444340074-15437-7-git-send-email-sylvain.rochet@finsecur.com> (raw)
In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com>

watchdog_init_timeout function doesn't try to get the "timeout-sec" DT
property if timeout_parm is not zero. This change makes this DT property
working for the sama5d4 watchdog driver.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
---
 drivers/watchdog/sama5d4_wdt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index a49634c..2e2049b 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -222,7 +222,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 		}
 	}
 
-	ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
+	/* Try to set timeout from device tree first */
+	ret = watchdog_init_timeout(wdd, 0, &pdev->dev);
+	if (ret)
+		ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "unable to set timeout value\n");
 		return ret;
@@ -243,7 +246,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, wdt);
 
 	dev_info(&pdev->dev, "initialized (timeout = %d sec, nowayout = %d)\n",
-		 wdt_timeout, nowayout);
+		 wdd->timeout, nowayout);
 
 	return 0;
 }
-- 
2.5.1

  parent reply	other threads:[~2015-10-08 21:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-08 21:34 [PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework Sylvain Rochet
2015-10-08 21:34 ` Sylvain Rochet
2015-10-08 21:34 ` [PATCH 1/6] watchdog: at91sam9: use devm_request_irq instead of request_irq Sylvain Rochet
2015-10-08 21:34   ` Sylvain Rochet
2015-10-08 21:34 ` [PATCH 2/6] watchdog: at91sam9: use watchdog_get_drvdata instead of container_of Sylvain Rochet
2015-10-08 21:34   ` Sylvain Rochet
2015-10-08 21:34 ` [PATCH 3/6] watchdog: at91sam9: rename heartbeats into timeout where necessary Sylvain Rochet
2015-10-08 21:34   ` Sylvain Rochet
2015-10-12 10:07   ` Sylvain Rochet
2015-10-12 10:07     ` Sylvain Rochet
2015-10-08 21:34 ` [PATCH 4/6] watchdog: at91sam9: remove nowayout useless copy Sylvain Rochet
2015-10-08 21:34   ` Sylvain Rochet
2015-10-08 21:34 ` [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Sylvain Rochet
2015-10-08 21:34   ` Sylvain Rochet
2015-10-08 21:34 ` Sylvain Rochet [this message]
2015-10-08 21:34   ` [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first Sylvain Rochet
2015-10-12  7:50   ` Alexandre Belloni
2015-10-12  7:50     ` Alexandre Belloni
2015-10-12  8:12     ` Yang, Wenyou
2015-10-12  8:12       ` Yang, Wenyou
2015-10-12 13:56       ` Sylvain Rochet
2015-10-12 13:56         ` Sylvain Rochet
2015-10-12  9:09     ` Sylvain Rochet
2015-10-12  9:09       ` Sylvain Rochet

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=1444340074-15437-7-git-send-email-sylvain.rochet@finsecur.com \
    --to=sylvain.rochet@finsecur.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=ludovic.desroches@atmel.com \
    --cc=nicolas.ferre@atmel.com \
    --cc=wenyou.yang@atmel.com \
    --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: link
Be 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.