From patchwork Thu Nov 22 12:51:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1783721 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 45891DF230 for ; Thu, 22 Nov 2012 12:56:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbWHl-0003IW-H3; Thu, 22 Nov 2012 12:53:41 +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 1TbWGU-0002ky-QS for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 12:52:26 +0000 Received: by mail-bk0-f49.google.com with SMTP id jm19so2166226bkc.36 for ; Thu, 22 Nov 2012 04:52:22 -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=91uq6eZg/wQDhQxD04QlZauOz6KKhtKmAJIS8Bcz3EE=; b=Q8qJbATBHW0Z9D36kLTfZsehOj4xKxHDdWCPN9ygBiDXOV/8MPwHFPtyrp9r6ZGwdP WTUH00s2ilwYgs4/QCU7JhJ3ty/f3998X943I9yJyLQiipUrZBU1XcrzuZYe3hBVrv11 91JluzKl3sx2280ioDtmjGN7o9axIZlGXtCwmomat9bOzO15cgPC3azj+MYM/csmDtlu bMq5oGUb+i4LpGm0E3CJa4skg+FM4QDyq/wpewRgJy+w/CjLagThcXGaCsTuB2zNku5F a6W/eeOEWwzAvebFIibO+NTJJKsZQ87cD0dyp6jX+k4wI/j6XVsKflP6bOv5Jp4b1H50 ai0w== Received: by 10.204.143.147 with SMTP id v19mr212981bku.32.1353588742412; Thu, 22 Nov 2012 04:52:22 -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.19 (version=SSLv3 cipher=OTHER); Thu, 22 Nov 2012 04:52:21 -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 5/7] watchdog: at91sam9_wdt: add timeout-sec property binding Date: Thu, 22 Nov 2012 13:51:54 +0100 Message-Id: <1353588716-28917-6-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_075224_427839_D6E2CCF1 X-CRM114-Status: GOOD ( 15.55 ) 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 Tested on at91sam9260 board (evk-pro3). Signed-off-by: Fabio Porcedda Cc: Andrew Victor Cc: Jean-Christophe PLAGNIOL-VILLARD Acked-by: Nicolas Ferre --- Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 4 ++++ drivers/watchdog/Kconfig | 1 + drivers/watchdog/at91sam9_wdt.c | 16 +++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt index 2957ebb..fcdd48f 100644 --- a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt @@ -7,9 +7,13 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. +Optional properties: +- timeout-sec: contains the watchdog timeout in seconds. + Example: watchdog@fffffd40 { compatible = "atmel,at91sam9260-wdt"; reg = <0xfffffd40 0x10>; + timeout-sec = <10>; }; diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index ad1bb93..dda695f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -114,6 +114,7 @@ config AT91RM9200_WATCHDOG config AT91SAM9X_WATCHDOG tristate "AT91SAM9X / AT91CAP9 watchdog" depends on ARCH_AT91 && !ARCH_AT91RM9200 + select WATCHDOG_CORE help Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will reboot your system when the timeout is reached. diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index dc42e44..d864dc4 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -57,8 +57,10 @@ #define WDT_TIMEOUT (HZ/2) /* User land timeout */ +#define MIN_HEARTBEAT 1 +#define MAX_HEARTBEAT 16 #define WDT_HEARTBEAT 15 -static int heartbeat = WDT_HEARTBEAT; +static int heartbeat; module_param(heartbeat, int, 0); MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " "(default = " __MODULE_STRING(WDT_HEARTBEAT) ")"); @@ -255,6 +257,12 @@ static struct miscdevice at91wdt_miscdev = { .fops = &at91wdt_fops, }; +static struct watchdog_device at91wdt_wdd __initdata = { + .timeout = WDT_HEARTBEAT, + .min_timeout = MIN_HEARTBEAT, + .max_timeout = MAX_HEARTBEAT, +}; + static int __init at91wdt_probe(struct platform_device *pdev) { struct resource *r; @@ -273,6 +281,8 @@ static int __init at91wdt_probe(struct platform_device *pdev) return -ENOMEM; } + watchdog_init_timeout(&at91wdt_wdd, heartbeat, pdev->dev.of_node); + /* Set watchdog */ res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000)); if (res) @@ -282,12 +292,12 @@ static int __init at91wdt_probe(struct platform_device *pdev) if (res) return res; - at91wdt_private.next_heartbeat = jiffies + heartbeat * HZ; + at91wdt_private.next_heartbeat = jiffies + at91wdt_wdd.timeout * HZ; setup_timer(&at91wdt_private.timer, at91_ping, 0); mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT); pr_info("enabled (heartbeat=%d sec, nowayout=%d)\n", - heartbeat, nowayout); + at91wdt_wdd.timeout, nowayout); return 0; }