From patchwork Mon May 28 18:01:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Jui X-Patchwork-Id: 10433945 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D366960327 for ; Mon, 28 May 2018 18:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC5E32845E for ; Mon, 28 May 2018 18:19:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CAE028475; Mon, 28 May 2018 18:19:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C6C42845E for ; Mon, 28 May 2018 18:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=SQ/CzyhUgfL6nE/K+sgXrEP67HGTn+N7Ow7wCAL36Bo=; b=I1P17FqlM5j/nEJPyf23fcSHI5 LXNAaEM2oqjMFzn6nD11iJJ9wUh+H8ATY/w7H0f1oQV8ybrhu+TpARr2mGg72slSjlGxaD1X12dCZ UXsTDswNoWSASQ/BBUjKQ7KQ6Y8xh7f4GKyHSgYzF0c+CMukXwVxI+ec1qVApTns7okv9O6838WWh ljqKceyaERU/ANPnDrQ/7hlPeEUsB/IVVZMIp82+lGBaxZeHqMUq1StNBOm7M1ZGXaYJUoL5miXPC NR9PiWC4rN2JVreOpMVe7jk9exBpUD90j8BYlWH6ZZtnoV/cGzAWCsY1Ovb5IkHAlYsOko0uoAL8M 7KKCL5LQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNMja-000301-2J; Mon, 28 May 2018 18:19:06 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fNMTG-0004MH-Nb for linux-arm-kernel@lists.infradead.org; Mon, 28 May 2018 18:02:26 +0000 Received: by mail-qt0-x243.google.com with SMTP id q13-v6so15749792qtp.4 for ; Mon, 28 May 2018 11:02:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7U2YbvrMgsvjeAIPsnIuI9sG2Ge/TSI1Bmbq6FUhwCs=; b=Z+FoFDI58lT2/D5M9ToYCIWLbipJ8d9uPjv2VJ6u/+hstVO0w3y/aN63z6iHpBL43l SbtUNPyHfGQGz/qzCzjNBD7aJ+wml0IBH4Ana/J2q5K+onvdLNIbRV1TRwQy0iL8qsOg AHYq00hd2DqPk18pDeWgDnBZ9AL/RiT/bDWmw= 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=7U2YbvrMgsvjeAIPsnIuI9sG2Ge/TSI1Bmbq6FUhwCs=; b=MzaBGWvLeoDGz19984Vmi6dwx4tVeW2TkHD6WPgnOOB0sJIzi2uzQMKyCLbw+oHwCA 22CnSMrwirRQI+3f8ZNMei7U0SASfmuSLdnN33J+QDWHyKiONwLwZbYpTkJMs/RtQY+q EsCkeDPFSd/gObei/ZtX6guvyma5Fih3nAg0mtwnFPu6DKETuoolmQbBcafDJeCv26UH IrU3UcuZLTW+Z7v238AgWHA5vNjd37uBvBSZspnI2n/ZG8G2ppAULzSpSy50kJUg7hGm O0xXP9ICoLGeqHoPCRy1XFpg7uYM/HQwIrDGG07ddMNnos8kXeHb9DtQP4bWPjrSUom0 59vg== X-Gm-Message-State: ALKqPwd7KOXuDdFDM8GgQS3gPaQ7tBub8Mo5XS5UPn21MbZ2KfDyNh4B rqJCAglg3mO+np7aXaLpzF2SXQ== X-Google-Smtp-Source: ADUXVKKrEzWBPVUHujvO3Jprwy68x1G3AuiItl92fJoSMvgyjrxxmXHedjYQHSvZ7JExBlRDuM+y3g== X-Received: by 2002:aed:3030:: with SMTP id 45-v6mr12869747qte.384.1527530523306; Mon, 28 May 2018 11:02:03 -0700 (PDT) Received: from lbrmn-lnxub44-1.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id f26-v6sm22340905qtg.50.2018.05.28.11.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 May 2018 11:02:02 -0700 (PDT) From: Ray Jui To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Mark Rutland , Frank Rowand , Catalin Marinas , Will Deacon , Robin Murphy Subject: [PATCH v4 3/6] watchdog: sp805: add 'timeout-sec' DT property support Date: Mon, 28 May 2018 11:01:34 -0700 Message-Id: <1527530497-10392-4-git-send-email-ray.jui@broadcom.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1527530497-10392-1-git-send-email-ray.jui@broadcom.com> References: <1527530497-10392-1-git-send-email-ray.jui@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180528_110214_785668_60D76F1D X-CRM114-Status: GOOD ( 15.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Ray Jui , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for optional devicetree property 'timeout-sec'. 'timeout-sec' is used in the driver if specified in devicetree. Otherwise, fall back to driver default, i.e., 60 seconds Signed-off-by: Ray Jui Reviewed-by: Scott Branden Reviewed-by: Guenter Roeck --- drivers/watchdog/sp805_wdt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index 03805bc..1484609 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -230,7 +230,14 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) spin_lock_init(&wdt->lock); watchdog_set_nowayout(&wdt->wdd, nowayout); watchdog_set_drvdata(&wdt->wdd, wdt); - wdt_setload(&wdt->wdd, DEFAULT_TIMEOUT); + + /* + * If 'timeout-sec' devicetree property is specified, use that. + * Otherwise, use DEFAULT_TIMEOUT + */ + wdt->wdd.timeout = DEFAULT_TIMEOUT; + watchdog_init_timeout(&wdt->wdd, 0, &adev->dev); + wdt_setload(&wdt->wdd, wdt->wdd.timeout); ret = watchdog_register_device(&wdt->wdd); if (ret) {