From patchwork Wed Feb 13 12:22:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 2135791 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 E989CDFE75 for ; Wed, 13 Feb 2013 12:25:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5bMU-000368-VR; Wed, 13 Feb 2013 12:22:54 +0000 Received: from mail-ea0-f174.google.com ([209.85.215.174]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5bMH-00032l-RD for linux-arm-kernel@lists.infradead.org; Wed, 13 Feb 2013 12:22:43 +0000 Received: by mail-ea0-f174.google.com with SMTP id 1so486608eaa.19 for ; Wed, 13 Feb 2013 04:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=KhjIR4S7hK7ICMAeyTJmRDSAW5AqDAsg+CbFtEIKYSg=; b=fL/J1mf/OrhgXlhEYWwuTazS1tqiAebCfRGPSbnPP1yQePK8TTqVA9gtNFkWcwnpcW BjpWRgkkruoFtzgWfeXg7DJtvA/9YUhcUl976Jw/TYaohdSOymPf/G+grWj7jai0BhsQ 1d0jI9p/ioHu8Y0mHum85ZYIaUHJivpXEgd8sjGONCaYwS+4HrDNrxSdupDrZQUlrrlX I9vGd/9/PqxlDbEkd/23783rhIH02rGwNSvc3nU7DI5UD9DAg6HbOI8BLtLpASXfj42Z edWzFrqCA1QbFddr+VT7r71zw2go0dLqsgTGghlpbyLmBobCnHZ75MbQpPrgE4SI2HnJ YbhA== X-Received: by 10.14.4.69 with SMTP id 45mr76201453eei.0.1360758159927; Wed, 13 Feb 2013 04:22:39 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id a1sm47561728eep.2.2013.02.13.04.22.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Feb 2013 04:22:39 -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 v8 2/7] watchdog: core: dt: add support for the timeout-sec dt property Date: Wed, 13 Feb 2013 13:22:25 +0100 Message-Id: <1360758150-23004-3-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> References: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130213_072242_040192_0EAE16A2 X-CRM114-Status: GOOD ( 16.84 ) 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.215.174 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, Wenyou Yang 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 Signed-off-by: Fabio Porcedda --- Documentation/watchdog/watchdog-kernel-api.txt | 10 ++++++++ drivers/watchdog/watchdog_core.c | 34 ++++++++++++++++++++++++++ include/linux/watchdog.h | 2 ++ 3 files changed, 46 insertions(+) diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt index 086638f..44098c2 100644 --- a/Documentation/watchdog/watchdog-kernel-api.txt +++ b/Documentation/watchdog/watchdog-kernel-api.txt @@ -212,3 +212,13 @@ driver specific data to and a pointer to the data itself. The watchdog_get_drvdata function allows you to retrieve driver specific data. The argument of this function is the watchdog device where you want to retrieve data from. The function returns the pointer to the driver specific data. + +To initialize the timeout field use the following function: + +extern void watchdog_init_timeout(struct watchdog_device *wdd, + unsigned int parm_timeout, + struct device_node *node); + +The watchdog_init_timeout function allows you to initialize the timeout field +using the module timeout parameter or retrieving the timeout-sec property from +the device tree. diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index f10fa31..b9e9148 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -36,6 +36,7 @@ #include /* For __init/__exit/... */ #include /* For ida_* macros */ #include /* For IS_ERR macros */ +#include /* For of_get_timeout_sec */ #include "watchdog_core.h" /* For watchdog_dev_register/... */ @@ -57,6 +58,39 @@ bool watchdog_is_valid_timeout(struct watchdog_device *wdd, uint timeout) EXPORT_SYMBOL_GPL(watchdog_is_valid_timeout); /** + * watchdog_init_timeout() - initialize the timeout field + * @parm: timeout module parameter, it takes precedence over the + * timeout-sec property. + * @node: Retrieve the timeout-sec property only if the parm_timeout + * is out of bounds. + */ +int watchdog_init_timeout(struct watchdog_device *wdd, uint parm, + struct device *dev) +{ + uint timeout = 0; + int ret = 0; + + if (watchdog_is_valid_timeout(wdd, parm)) { + wdd->timeout = parm; + return ret; + } + if (parm) + ret = -EINVAL; + + /* try to get the timeout_sec property */ + if (!dev->of_node) + return ret; + of_property_read_u32(dev->of_node, "timeout-sec", &timeout); + if (watchdog_is_valid_timeout(wdd, timeout)) + wdd->timeout = timeout; + else + ret = -EINVAL; + + return ret; +} +EXPORT_SYMBOL_GPL(watchdog_init_timeout); + +/** * watchdog_register_device() - register a watchdog device * @wdd: watchdog device * diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 9ae945e..b1023dd 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -132,6 +132,8 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) /* drivers/watchdog/watchdog_core.c */ extern bool watchdog_is_valid_timeout(struct watchdog_device *wdd, uint timeout); +extern int watchdog_init_timeout(struct watchdog_device *wdd, + uint parm_timeout, struct device *dev); extern int watchdog_register_device(struct watchdog_device *); extern void watchdog_unregister_device(struct watchdog_device *);