From patchwork Mon Oct 1 12:24:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1531211 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 7B2143FE1C for ; Mon, 1 Oct 2012 12:26:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIf3S-0002UB-Pg; Mon, 01 Oct 2012 12:24:58 +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 1TIf3J-0002Sn-P8 for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 12:24:50 +0000 Received: by bkwj4 with SMTP id j4so4566070bkw.36 for ; Mon, 01 Oct 2012 05:24:48 -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=Ii6IYhvIBxXVQcxxzZkBlwPRqr/HtIOGyCFHV3OFYh4=; b=y6SbTRcPKyO6IWob1sqjE1AudgA4bXr/pUv/2W3CeAy1WXFe/L5asiRuSdyERReEa2 3oFvez20Io2f1g08Fzy55ogTr28iTceCpUaRPTqfEX97hooGP+94alC2ItIJsrKl1DS0 Oc1CvqvrMiVLvo9EgRsizZVUNshKWfDvWGxP6z1dKc7Ca+jP+tFC2eS8D4o8jvUs6JwX bFTYQzA5I+T3eD/Iawvh/F6nUeR+VIZJHpyUgQTRXNalxdrOz+dzD3jdpD8HM7XtQ2h4 UBp1C4N8IthCIAQCePYbpsSjeELtRNwfenICiKdawPaRBqJqupLAITLCeYw5YEqWYZyk NMNw== Received: by 10.204.148.214 with SMTP id q22mr910896bkv.128.1349094288577; Mon, 01 Oct 2012 05:24:48 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id w9sm8430994bkv.3.2012.10.01.05.24.46 (version=SSLv3 cipher=OTHER); Mon, 01 Oct 2012 05:24:47 -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: [PATCH v6 1/5] watchdog: core: dt: add support for the timeout device tree property Date: Mon, 1 Oct 2012 14:24:37 +0200 Message-Id: <1349094281-28889-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1349094281-28889-1-git-send-email-fabio.porcedda@gmail.com> References: <1349094281-28889-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 [209.85.214.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 Signed-off-by: Fabio Porcedda --- Documentation/watchdog/watchdog-kernel-api.txt | 3 +++ include/linux/watchdog.h | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt index 086638f..decd981 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 function allows you to retrieve the timeout property +from the device tree. diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index da70f0f..06f9384 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,16 @@ static inline void *watchdog_get_drvdata(struct watchdog_device *wdd) return wdd->driver_data; } +/* Use the following function to retrieve the timeout property from dt */ +static inline void watchdog_probe_dt(struct watchdog_device *wdd, + struct device_node *node) +{ + if (!node) + return; + + of_property_read_u32(node, "timeout", &wdd->timeout); +} + /* drivers/watchdog/core/watchdog_core.c */ extern int watchdog_register_device(struct watchdog_device *); extern void watchdog_unregister_device(struct watchdog_device *);