From patchwork Thu Oct 4 08:26:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1545401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 1906B3FD9C for ; Thu, 4 Oct 2012 08:29:19 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJgmD-0007Nt-Km; Thu, 04 Oct 2012 08:27:25 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJglw-0007MD-6c for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2012 08:27:09 +0000 Received: by mail-ee0-f49.google.com with SMTP id c1so163639eek.36 for ; Thu, 04 Oct 2012 01:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=HMpwd519KPSsetrp2lOvSnj3wlguDWcyCcmC7BI+eZY=; b=EA0QEm82Gzty5Vhx7okHgC+makNcInL6lQGfx/YmMAbl7i0yopVx8uhWP8lBRNHwW0 jux4KykyqtIJbYOzwKTcI0iSbEN/SYp7brln/cUQkcpA+9quq9ng739OYEhWnkMPouVr y6VaiTIHWDcMlku79OPrI6L4eKLYkLStGMpF+TN631KfPzxMdLyfnzwSV5W2EfB3GeUd TdGGa/XCGCkdPiI67Ue3chNOXJR3qPwrHDWli+lsxKtmjxWcdTEL6c6sG/Rdlncg2PWj vARktQg0TZNCZ0bF35RgW2No9iJXTgp/uqibB5WEzg9cHJGdRhuEbEqDHcqWB0+iUfSH ZG/w== Received: by 10.14.203.70 with SMTP id e46mr6427236eeo.2.1349339227117; Thu, 04 Oct 2012 01:27:07 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id 7sm13158374eej.13.2012.10.04.01.27.05 (version=SSLv3 cipher=OTHER); Thu, 04 Oct 2012 01:27:06 -0700 (PDT) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , Jason Cooper , Andrew Lunn Subject: [RFC PATCH v2 2/2] watchdog: add timeout-sec property binding to some drivers Date: Thu, 4 Oct 2012 10:26:59 +0200 Message-Id: <1349339219-1467-3-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1349339219-1467-1-git-send-email-fabio.porcedda@gmail.com> References: <1349339219-1467-1-git-send-email-fabio.porcedda@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: devicetree-discuss@lists.ozlabs.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The binding is provided by the watchdog core. Signed-off-by: Fabio Porcedda f2 --- .../devicetree/bindings/watchdog/atmel-wdt.txt | 4 ++++ .../devicetree/bindings/watchdog/marvel.txt | 5 +++++ drivers/watchdog/at91sam9_wdt.c | 23 ++++++++++++++++------ drivers/watchdog/orion_wdt.c | 13 ++++++------ 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt index 2957ebb..ad4cc0a 100644 --- a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt @@ -7,9 +7,13 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. +Optional properties: +- timeout-sec : Contains the watchdog timeout in seconds + Example: watchdog@fffffd40 { compatible = "atmel,at91sam9260-wdt"; reg = <0xfffffd40 0x10>; + timeout-sec = <10>; }; diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt index 0b2503a..5dc8d30 100644 --- a/Documentation/devicetree/bindings/watchdog/marvel.txt +++ b/Documentation/devicetree/bindings/watchdog/marvel.txt @@ -5,10 +5,15 @@ Required Properties: - Compatibility : "marvell,orion-wdt" - reg : Address of the timer registers +Optional properties: + +- timeout-sec : Contains the watchdog timeout in seconds + Example: wdt@20300 { compatible = "marvell,orion-wdt"; reg = <0x20300 0x28>; + timeout-sec = <10>; status = "okay"; }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index dc42e44..3f66193 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "at91sam9_wdt.h" @@ -57,11 +56,13 @@ #define WDT_TIMEOUT (HZ/2) /* User land timeout */ -#define WDT_HEARTBEAT 15 -static int heartbeat = WDT_HEARTBEAT; +#define MIN_HEARTBEAT 1 +#define MAX_HEARTBEAT 16 +#define DEF_HEARTBEAT 15 +static int heartbeat = 0; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " - "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); + "(default = " __MODULE_STRING(DEF_HEARTBEAT) ")"); static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); @@ -255,6 +256,11 @@ static struct miscdevice at91wdt_miscdev = { .fops = &at91wdt_fops, }; +static struct watchdog_device at91wdt_wdd __initdata = { + .min_timeout = MIN_HEARTBEAT, + .max_timeout = MAX_HEARTBEAT, +}; + static int __init at91wdt_probe(struct platform_device *pdev) { struct resource *r; @@ -273,6 +279,11 @@ static int __init at91wdt_probe(struct platform_device *pdev) return -ENOMEM; } + if ((heartbeat < MIN_HEARTBEAT) || (heartbeat > MAX_HEARTBEAT)) { + at91wdt_wdd.timeout = DEF_HEARTBEAT; + watchdog_probe_dt_timeout(&at91wdt_wdd, pdev->dev.of_node); + } + /* Set watchdog */ res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000)); if (res) @@ -282,12 +293,12 @@ static int __init at91wdt_probe(struct platform_device *pdev) if (res) return res; - at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ; + at91wdt_private.next_heartbeat = jiffies + at91wdt_wdd.timeout * HZ; setup_timer(&at91wdt_private.timer, at91_ping, 0); mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); pr_info("enabled (heartbeat=%d sec, nowayout=%d)\n", - heartbeat, nowayout); + at91wdt_wdd.timeout, nowayout); return 0; } diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index c20f96b..14406e6 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* @@ -162,12 +161,14 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; - if ((heartbeat < 1) || (heartbeat > wdt_max_duration)) - heartbeat = wdt_max_duration; - - orion_wdt.timeout = heartbeat; orion_wdt.min_timeout = 1; orion_wdt.max_timeout = wdt_max_duration; + if ((heartbeat >= 1) && (heartbeat <= wdt_max_duration)) { + orion_wdt.timeout = heartbeat; + } else { + orion_wdt.timeout = wdt_max_duration; + watchdog_probe_dt_timeout(&orion_wdt, pdev->dev.of_node); + } watchdog_set_nowayout(&orion_wdt, nowayout); ret = watchdog_register_device(&orion_wdt); @@ -177,7 +178,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) } pr_info("Initial timeout %d sec%s\n", - heartbeat, nowayout ? ", nowayout" : ""); + orion_wdt.timeout, nowayout ? ", nowayout" : ""); return 0; }