From patchwork Thu Nov 22 12:51:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1783691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E36DFDF230 for ; Thu, 22 Nov 2012 12:56:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbWGp-0002tg-AG; Thu, 22 Nov 2012 12:52:43 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbWGM-0002k1-4j for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 12:52:15 +0000 Received: by mail-bk0-f49.google.com with SMTP id jm19so2166180bkc.36 for ; Thu, 22 Nov 2012 04:52:13 -0800 (PST) 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=pDdU5IOs1Ba5KE4up+LWDaDxmkk0EhNsj+mNFOZgVfg=; b=PSeLLDo+rdVuraBR0tYZprA6AG4HZe5W/3VpShQEbHX0t0E7/a5eyNCddIon1SqZTE ug5HvSUaZtD6Lyq4WWFwvEEake57BbsAo+aqdLW1jjPoDiCT+7SNOplPaOJg0ueABfJv e5PMDoFMBxRpAuHawREeLjbUH5WXGQ4s/v3RdjKQE/iMihRM3mca+EYbpJXoh4HGbHmc ViEXEEXss3E+IVtB6LT+lEkoIM6vNsBk47jXHmgIw1k4kJJvCk+bZhD/k++3JCxWzpPq xgEhyTg3VJHOBwVQFFMp0gZ9Q0cuV3hJtT6xPirzg3TJwbzpGIuBuqnSnFCKsVIEV9eH 8m8Q== Received: by 10.204.11.79 with SMTP id s15mr183429bks.136.1353588733719; Thu, 22 Nov 2012 04:52:13 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id go4sm2252054bkc.15.2012.11.22.04.52.11 (version=SSLv3 cipher=OTHER); Thu, 22 Nov 2012 04:52:12 -0800 (PST) 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 , Ben Dooks , Kukjin Kim Subject: [PATCH v6 2/7] watchdog: orion_wdt: add timeout-sec property binding Date: Thu, 22 Nov 2012 13:51:51 +0100 Message-Id: <1353588716-28917-3-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353588716-28917-1-git-send-email-fabio.porcedda@gmail.com> References: <1353588716-28917-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_075214_406336_B1806408 X-CRM114-Status: GOOD ( 11.18 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 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 Only compile tested. Signed-off-by: Fabio Porcedda Cc: Andrew Lunn Acked-by: Jason Cooper --- Documentation/devicetree/bindings/watchdog/marvel.txt | 5 +++++ drivers/watchdog/orion_wdt.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) 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/orion_wdt.c b/drivers/watchdog/orion_wdt.c index c20f96b..446a3e9 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -162,12 +162,10 @@ 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.timeout = wdt_max_duration; orion_wdt.max_timeout = wdt_max_duration; + watchdog_init_timeout(&orion_wdt, heartbeat, pdev->dev.of_node); watchdog_set_nowayout(&orion_wdt, nowayout); ret = watchdog_register_device(&orion_wdt); @@ -177,7 +175,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; }