From patchwork Mon Oct 1 12:24:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1531201 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 33BC53FE1C 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 1TIf3a-0002VC-Kq; Mon, 01 Oct 2012 12:25:06 +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 1TIf3K-0002Sm-Vy for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 12:24:51 +0000 Received: by mail-bk0-f49.google.com with SMTP id j4so4566052bkw.36 for ; Mon, 01 Oct 2012 05:24:50 -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=wOLXnCdiDCnGO/t85/xtevjXxg6diEV4i17E4IKGvPE=; b=dmvDPJORPHPNpjr1XKgjFKeD5n31dya8qrJWwVASqFXlg2KU8NPAXm6TemKUliiwjF bt9e7BdcNgnttAFCDg/Sd4XG5pUsIzN0zvKYxSjofAJWjVZcx8o2nn939aiQqsM5Ww9m lHAJ9shDzyi7AYJY2OhIYzAHqybb8KTJ3Lb2bUAQGrPwKNoqRe3vX47FhZyi4zpL5eDP DyXctNQPETaAwOgRiXsR4h6CD4WMo+yj/k+12xNd3P4GPzjlpcMu2ZHFCzkjN/lQh4MD 5DVX1am3aAODsJgiXDXk0YBonNJVLm9XoAJo0DsQm3Gi2RjlpnS4v05TwyVxOIQUwzNN Whbg== Received: by 10.204.156.17 with SMTP id u17mr5988875bkw.52.1349094290606; Mon, 01 Oct 2012 05:24:50 -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.48 (version=SSLv3 cipher=OTHER); Mon, 01 Oct 2012 05:24:49 -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 2/5] watchdog: orion_wdt: dt: add the timeout property binding Date: Mon, 1 Oct 2012 14:24:38 +0200 Message-Id: <1349094281-28889-3-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 The binding is provided by the watchdog core. Signed-off-by: Fabio Porcedda --- Documentation/devicetree/bindings/watchdog/marvel.txt | 5 +++++ drivers/watchdog/orion_wdt.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt index 0b2503a..66c2b8c 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 : Contains the watchdog timeout in seconds + Example: wdt@20300 { compatible = "marvell,orion-wdt"; reg = <0x20300 0x28>; + timeout = <10>; status = "okay"; }; diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index c20f96b..3dc7481 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* @@ -168,6 +167,7 @@ static int __devinit orion_wdt_probe(struct platform_device *pdev) orion_wdt.timeout = heartbeat; orion_wdt.min_timeout = 1; orion_wdt.max_timeout = wdt_max_duration; + watchdog_probe_dt(&orion_wdt, pdev->dev.of_node); watchdog_set_nowayout(&orion_wdt, nowayout); ret = watchdog_register_device(&orion_wdt);