From patchwork Thu Oct 4 08:26:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1545391 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 CF7A83FD9C for ; Thu, 4 Oct 2012 08:29:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJgm6-0007N7-JY; Thu, 04 Oct 2012 08:27:18 +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-0007MC-6j 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 c1so163614eek.36 for ; Thu, 04 Oct 2012 01:27:05 -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=meySAQcqiFxEeiRzZCqKIcFgiIVNMN5eyzFzISb53ZE=; b=d8WsydjpiqX5xWLdIKgI1ZMsoyLffD7dlC33lhiw8Rtp9mfShIET07DVp2J02sFMS5 gnTzjOBj8IrACreEY8tQFPMowgiPXyfYIiPFrSKg5QG+QB+aeoiHZTmf50bsGk/ji/mz Fse+Frzjsvh1LGBDKzi5qOGUM5xinHBnzgp4uwit7+a2I8CtQdQkZPNVoyGB3/+YHBvF yErxfP8ONH31AkyU/klEpoi09D0zV/6mMqA+KSJxX4BSkQYtX+rmD3PldUBzZorz+P+c ojf617FHxa0+kx6mcGIx2Q382n1NDccAeq8EX3+/MHBTwJlBRDVlM4rAtG/pYyXbjpH7 2ENQ== Received: by 10.14.207.5 with SMTP id m5mr6368285eeo.22.1349339225318; Thu, 04 Oct 2012 01:27:05 -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.03 (version=SSLv3 cipher=OTHER); Thu, 04 Oct 2012 01:27:04 -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 1/2] watchdog: core: dt: add support for the timeout-sec dt property Date: Thu, 4 Oct 2012 10:26:58 +0200 Message-Id: <1349339219-1467-2-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.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -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 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 Signed-off-by: Fabio Porcedda --- Documentation/watchdog/watchdog-kernel-api.txt | 3 +++ include/linux/watchdog.h | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt index 086638f..35057b2 100644 --- a/Documentation/watchdog/watchdog-kernel-api.txt +++ b/Documentation/watchdog/watchdog-kernel-api.txt @@ -212,3 +212,6 @@ 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. + +The watchdog_probe_dt_timeout function allows you to retrieve the timeout-sec +property from the device tree. diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index da70f0f..18af39f 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h @@ -11,6 +11,7 @@ #include #include +#include #define WATCHDOG_IOCTL_BASE 'W' @@ -174,6 +175,20 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) return wdd->driver_data; } +/* Use the following function to retrieve the timeout-sec property from dt */ +static inline void watchdog_probe_dt_timeout(struct watchdog_device *wdd, + struct device_node *node) +{ + unsigned int t = 0; + + if (!node) + return; + + of_property_read_u32(node, "timeout-sec", &t); + if ((t >= wdd->min_timeout) && (t <= wdd->max_timeout)) + wdd->timeout = t; +} + /* drivers/watchdog/core/watchdog_core.c */ extern int watchdog_register_device(struct watchdog_device *); extern void watchdog_unregister_device(struct watchdog_device *);