From patchwork Sun Feb 11 20:08:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 871795 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Sds9+gzb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zffzr4j4Kz9t3F for ; Mon, 12 Feb 2018 07:10:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753766AbeBKUJe (ORCPT ); Sun, 11 Feb 2018 15:09:34 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:45151 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932085AbeBKUJ3 (ORCPT ); Sun, 11 Feb 2018 15:09:29 -0500 Received: by mail-lf0-f65.google.com with SMTP id x196so17764122lfd.12; Sun, 11 Feb 2018 12:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=j1ApF4jt8BovR70XpiAilM+LgFAzFw4UOdhesh3SFLQ=; b=Sds9+gzb23Oby2EhX55brmUkvpejf9ZMZqoSqq5bJPq5SVurDJohVcLGUA3tukaewM HaEpI2u+GyHHgY1eIVWGNlSw3Obiz/pxepc58otcV/2hdsYY/3qEzBAbzJHCdRCcpfMg hUBSEhUFo8BslW+XrgKA0q+wKeNgTqEIHh8DUs79QLX6gqAuSrUjDTUUGGAeTMy0/uxN hwioFEG7Y2ghuWqeag9ecC3E6a3DE4PNnMiYg5o7G4Pp/vzmp/Ei7ZbLmCDRSp91N6L9 JX7XudcSaFumqgiUGsMsD3s6H89fDFR3OI5q7h4RDvLPTMNDSI3Ij1T1GY0F/b5Fzi4D swKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=j1ApF4jt8BovR70XpiAilM+LgFAzFw4UOdhesh3SFLQ=; b=ECFpNi529GemODe+PLBsiJPQeWrSzF6sSKr+TUl8Qjlm2rSTy4p9AKbOrIsati0577 4d7U57GdXBrLsMsNqQfArf7IWpSCM3fvr5zjhWarytbl35s/Z0+HSfpG607KeXfltv5w NLOdmiESB5L1MM1bScoazzpeFhlXOVBsoqffPzhETV+4uUzX9pH45WwcwPn4m8yjUcr8 7xGsaqbaTRiL8yWieuH+iOGMFqi2fIp/7rofb0hP1i8YE/31Z8wEmW6G1wW86iFQXead U+4zpVpE7yMQluZCVhEQaG6TcJKkGjs0z3wJdEiFK0BGBIRBL20okObbKZ/KmqHrfC5a MQ9Q== X-Gm-Message-State: APf1xPAcE/XxjCw4r88D29tcslW41h2YEdjm+vF4gK5g8a4rX9IhF1rM qfMr2CZ8Lx9xLpiqeC8bpEo= X-Google-Smtp-Source: AH8x2276wwAj9oIemnSI6ovFprl/2GN3JBMKsvyO39cov8cHUWXY9cgQXjLxx50FiuTgwtFgr1CIhQ== X-Received: by 10.25.25.208 with SMTP id 199mr6142332lfz.146.1518379767809; Sun, 11 Feb 2018 12:09:27 -0800 (PST) Received: from localhost.localdomain (c-2ec27091-74736162.cust.telenor.se. [46.194.112.145]) by smtp.gmail.com with ESMTPSA id c21sm927549lfb.13.2018.02.11.12.09.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 12:09:26 -0800 (PST) From: Marcus Folkesson To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Mark Rutland , Carlo Caione , Kevin Hilman , Matthias Brugger , Barry Song , Maxime Ripard , Chen-Yu Tsai , Linus Walleij , Vladimir Zapolskiy , Sylvain Lemieux , Nicolas Ferre , Alexandre Belloni Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Marcus Folkesson Subject: [PATCH v3 5/7] watchdog: mtk: allow setting timeout in devicetree Date: Sun, 11 Feb 2018 21:08:45 +0100 Message-Id: <20180211200847.25000-5-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180211200847.25000-1-marcus.folkesson@gmail.com> References: <20180211200847.25000-1-marcus.folkesson@gmail.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout. By following best practice described in Documentation/watchdog/watchdog-kernel-api.txt, it also let us to set timout-sec property in devicetree. Signed-off-by: Marcus Folkesson Reviewed-by: Guenter Roeck Acked-by: Matthias Brugger --- Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 4 ++++ drivers/watchdog/mtk_wdt.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt index 5b38a30e608c..859dee167b91 100644 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt @@ -11,9 +11,13 @@ Required properties: - reg : Specifies base physical address and size of the registers. +Optional properties: +- timeout-sec: contains the watchdog timeout in seconds. + Example: wdt: watchdog@10000000 { compatible = "mediatek,mt6589-wdt"; reg = <0x10000000 0x18>; + timeout-sec = <10>; }; diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 7ed417a765c7..fcdc10ec28a3 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -57,7 +57,7 @@ #define DRV_VERSION "1.0" static bool nowayout = WATCHDOG_NOWAYOUT; -static unsigned int timeout = WDT_MAX_TIMEOUT; +static unsigned int timeout; struct mtk_wdt_dev { struct watchdog_device wdt_dev;