From patchwork Thu Dec 2 09:32:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 520155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5541C43217 for ; Thu, 2 Dec 2021 09:32:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356479AbhLBJgK (ORCPT ); Thu, 2 Dec 2021 04:36:10 -0500 Received: from cpanel.siel.si ([46.19.9.99]:49366 "EHLO cpanel.siel.si" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240976AbhLBJgJ (ORCPT ); Thu, 2 Dec 2021 04:36:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=wM4XQpviNRkCpNz0ADbhoMhzhrXl/Jd+ZQAiAEjEdT8=; b=gbuqLeEln0eFh/QXtvgCW7NWNl etufhgHKmTAYRpD/bKllV0qB8ukN5ItQ/45z+qJ0grSPVJzoLA7nNLUPuWWw/L0lpYBWpehsYbqAW TACAupfGaCy4hTyGSo2l9BPcEdeefBlWFUQDMhFSbfrYPkrV3+IG1sP/U6j1980Uq2Q4WrMk+3X48 lZYEzmKb8e+6sxwIK3EuU8ParnUtBwju6320H6O0zIv9o9xUcY7y6SOsoBxzFYCN/OvXf+doKeCwZ /ta4O4x7TKtUrAPF8nCnVpyM/99yr3Snr8u45K4ya5ugEC6P8w7sitj6IHkbxJdLqXbprczH8adKf BnXahqVQ==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:52018 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1msiSA-00DPB6-Rd; Thu, 02 Dec 2021 10:32:42 +0100 From: Andrej Picej To: support.opensource@diasemi.com, linux@roeck-us.net, linux-watchdog@vger.kernel.org Cc: andrej.picej@norik.com, wim@linux-watchdog.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/4] mfd: da9062: make register CONFIG_I writable Date: Thu, 2 Dec 2021 10:32:27 +0100 Message-Id: <20211202093230.3951996-1-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org From: Stefan Christ Make the config register CONFIG_I writable to change the watchdog mode. Signed-off-by: Stefan Christ Signed-off-by: Andrej Picej Reviewed-by: Adam Thomson Acked-by: Guenter Roeck --- Chnages in v4: - no changes Changes in v3: - no chagnes Changes in v2: - no changes --- drivers/mfd/da9062-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c index 01f8e10dfa55..7041ba53efb4 100644 --- a/drivers/mfd/da9062-core.c +++ b/drivers/mfd/da9062-core.c @@ -556,6 +556,7 @@ static const struct regmap_range da9062_aa_writeable_ranges[] = { regmap_reg_range(DA9062AA_VBUCK3_B, DA9062AA_VBUCK3_B), regmap_reg_range(DA9062AA_VLDO1_B, DA9062AA_VLDO4_B), regmap_reg_range(DA9062AA_BBAT_CONT, DA9062AA_BBAT_CONT), + regmap_reg_range(DA9062AA_CONFIG_I, DA9062AA_CONFIG_I), regmap_reg_range(DA9062AA_GP_ID_0, DA9062AA_GP_ID_19), }; From patchwork Thu Dec 2 09:32:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 520492 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1A51C433FE for ; Thu, 2 Dec 2021 09:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356483AbhLBJgK (ORCPT ); Thu, 2 Dec 2021 04:36:10 -0500 Received: from cpanel.siel.si ([46.19.9.99]:49382 "EHLO cpanel.siel.si" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356459AbhLBJgJ (ORCPT ); Thu, 2 Dec 2021 04:36:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=dyIk5hA78X16RFXD8OnNYW+CBD5Jfl4vJx9AyepYcHU=; b=aJ0EvSL2k0vuhA7rwQH18H+CMp OTZr1itL/2y8MI7DI5ZrLklpDX2b+Fxn/u2zgLNK6E2+aUZGhOTcUitSvPCU4j4P8LNwCqv6NsZQj mfxMFItk67iaH+tDbvs1LNGejuAlbfl6fTboiMYN7LNtdoeXkimQPmz2d8TppIYgN5as08PIP8e3P P9pTc1NsF5tLqwKqHlLSqeV1LYQCF5NA/DCCJDhx1DV2qmt199Epb5V+n84k1PyotqON2fFlTYxSS MAs6LtX/nm6XgC/zi64JqgD84IW7EBfvli5EFdY0rrqK98R20ukRwdayH0tUowS7hJVHaxcFruA8o 7vmTcu7w==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:52018 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1msiSB-00DPB6-1h; Thu, 02 Dec 2021 10:32:42 +0100 From: Andrej Picej To: support.opensource@diasemi.com, linux@roeck-us.net, linux-watchdog@vger.kernel.org Cc: andrej.picej@norik.com, wim@linux-watchdog.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/4] watchdog: da9062: reset board on watchdog timeout Date: Thu, 2 Dec 2021 10:32:28 +0100 Message-Id: <20211202093230.3951996-2-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202093230.3951996-1-andrej.picej@norik.com> References: <20211202093230.3951996-1-andrej.picej@norik.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Implement a method to change watchdog timeout configuration based on DT binding ("dlg,wdt-sd"). There is a possibility to change the bahaviour of watchdog reset. Setting WATCHDOG_SD bit enables SHUTDOWN mode, and clearing it enables POWERDOWN mode on watchdog timeout. If no DT binding is specified the WATCHDOG_SD bit stays in default configuration, not breaking behaviour of devices which might depend on default fuse configuration. Note: This patch requires that the config register CONFIG_I is configured as writable in the da9062 multi function device. Signed-off-by: Andrej Picej --- Chnages in v4: - move the code to probe function Changes in v3: - no changes Changes in v2: - don't force the "reset" for all da9062-watchdog users, instead add DT binding where the behavior can be selected --- drivers/watchdog/da9062_wdt.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c index f02cbd530538..bd85f84b0fd4 100644 --- a/drivers/watchdog/da9062_wdt.c +++ b/drivers/watchdog/da9062_wdt.c @@ -195,8 +195,11 @@ static int da9062_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; unsigned int timeout; + unsigned int mask; struct da9062 *chip; struct da9062_watchdog *wdt; + int ret; + u32 val; chip = dev_get_drvdata(dev->parent); if (!chip) @@ -236,6 +239,30 @@ static int da9062_wdt_probe(struct platform_device *pdev) set_bit(WDOG_HW_RUNNING, &wdt->wdtdev.status); } + /* + * Configure what happens on watchdog timeout. Can be specified with + * "dlg,wdt-sd" dt-binding (0 -> POWERDOWN, 1 -> SHUTDOWN). + * If "dlg,wdt-sd" dt-binding is NOT set use the default. + */ + ret = device_property_read_u32(dev, "dlg,wdt-sd", &val); + if (!ret) { + if (val) + /* Use da9062's SHUTDOWN mode */ + mask = DA9062AA_WATCHDOG_SD_MASK; + else + /* Use da9062's POWERDOWN mode. */ + mask = 0x0; + + ret = regmap_update_bits(wdt->hw->regmap, + DA9062AA_CONFIG_I, + DA9062AA_WATCHDOG_SD_MASK, + mask); + + if (ret) + dev_err(dev, "failed to set wdt reset mode: %d\n", + ret); + } + return devm_watchdog_register_device(dev, &wdt->wdtdev); } From patchwork Thu Dec 2 09:32:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 520154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C031C4167B for ; Thu, 2 Dec 2021 09:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356487AbhLBJgM (ORCPT ); Thu, 2 Dec 2021 04:36:12 -0500 Received: from cpanel.siel.si ([46.19.9.99]:49402 "EHLO cpanel.siel.si" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356439AbhLBJgJ (ORCPT ); Thu, 2 Dec 2021 04:36:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JoWVJsvCXYY1I9He6RtFyygHgrm4/b7pQYSgt5eRc5I=; b=NRIXNTkb1H3IH21rsQLN8s/SPB R3weB2PYieJTrJQimij0T58d6xS5b1qj/Xi/RdUkCAgeH7+H81L/+I1btUJraTw1sUtP77+xpN2jB pSxhHIne6ZDctDk6/kad5LvHFoyVVLPPuTyde2VsIkHNZNQeTleUspMnkUWTz52QLozwcy4pdFoTX Wg2OIo1NMA9ZSLlz/FivNyELI2ApMKqa+1Bz1Yjpkr1X2UJiiwGdPDQTlPkfvdcOmEOPhjBh0o1Kx kv+jAaPaxGnfdp1QkkCZDqT48KCqnPHMONN5uoSjEW3q72HqMnKwMuFc0FxvUb8aC0Bzc1uWmZBJY bLZ79BNw==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:52018 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1msiSB-00DPB6-81; Thu, 02 Dec 2021 10:32:42 +0100 From: Andrej Picej To: support.opensource@diasemi.com, linux@roeck-us.net, linux-watchdog@vger.kernel.org Cc: andrej.picej@norik.com, wim@linux-watchdog.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/4] dt-bindings: watchdog: da9062: add watchdog timeout mode Date: Thu, 2 Dec 2021 10:32:29 +0100 Message-Id: <20211202093230.3951996-3-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202093230.3951996-1-andrej.picej@norik.com> References: <20211202093230.3951996-1-andrej.picej@norik.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Document the watchdog timeout mode property. If this property is used the user can select what happens on watchdog timeout. Set this property to 1 to enable SHUTDOWN (the device resets), set it to 0 and the device will go to POWERDOWN on watchdog timeout. If this property is not set, don't touch the WATCHDOG_SD bit and leave the configuration to OTP. This way backward compatibility is not broken. Signed-off-by: Andrej Picej Reviewed-by: Adam Thomson --- Changes in v4: - no changes Changes in v3: - add note about using the default OTP setting if this DT binding is not specified Changes in v2: - new patch, document new DT binding --- Documentation/devicetree/bindings/watchdog/da9062-wdt.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/da9062-wdt.txt b/Documentation/devicetree/bindings/watchdog/da9062-wdt.txt index 950e4fba8dbc..354314d854ef 100644 --- a/Documentation/devicetree/bindings/watchdog/da9062-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/da9062-wdt.txt @@ -10,6 +10,12 @@ Optional properties: - dlg,use-sw-pm: Add this property to disable the watchdog during suspend. Only use this option if you can't use the watchdog automatic suspend function during a suspend (see register CONTROL_B). +- dlg,wdt-sd: Set what happens on watchdog timeout. If this bit is set the + watchdog timeout triggers SHUTDOWN, if cleared the watchdog triggers + POWERDOWN. Can be 0 or 1. Only use this option if you want to change the + default chip's OTP setting for WATCHDOG_SD bit. If this property is NOT + set the WATCHDOG_SD bit and on timeout watchdog behavior will match the + chip's OTP settings. Example: DA9062 From patchwork Thu Dec 2 09:32:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Picej X-Patchwork-Id: 520493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8086BC433EF for ; Thu, 2 Dec 2021 09:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356463AbhLBJgJ (ORCPT ); Thu, 2 Dec 2021 04:36:09 -0500 Received: from cpanel.siel.si ([46.19.9.99]:49420 "EHLO cpanel.siel.si" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356461AbhLBJgJ (ORCPT ); Thu, 2 Dec 2021 04:36:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=norik.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=IxY7gxKP97JK6nFkzdWBH41boYf5ZKhvB11lleRUyUo=; b=KnSynsd3fo7xlW4R04fvVoxAZI WwrGTma1XzLuzUNrykz9P+6holt+o+uFqYsjTOSKod7np3MXbgpg10fQpWMwwlyrbJzuE8SFFk+Xi pjGG+ABdrdAgWGg//sN/YtryKOInIbN+plCUe39sIDbYu8gVAQJBXsAchKg+R9oFPpj0v7R1Hpr2R W5Aqy1cASzXF7opjtnW07KQozL4wxVciQglTKJ3NgQEGuYceE7JNTmEGdcp72Ff1KCHchmk8YlERI c4tDvUisBbQzibRIVeLKN5kv50Bb+aNRo9LOgrShRvploRdrQTEAlLO1BjeoL0Sw+zK9bswfOeGpY ZL7/R/hw==; Received: from 89-212-21-243.static.t-2.net ([89.212.21.243]:52018 helo=localhost.localdomain) by cpanel.siel.si with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1msiSB-00DPB6-Db; Thu, 02 Dec 2021 10:32:42 +0100 From: Andrej Picej To: support.opensource@diasemi.com, linux@roeck-us.net, linux-watchdog@vger.kernel.org Cc: andrej.picej@norik.com, wim@linux-watchdog.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/4] ARM: dts: imx6: phycore-som: set watchdog timeout mode to shutdown Date: Thu, 2 Dec 2021 10:32:30 +0100 Message-Id: <20211202093230.3951996-4-andrej.picej@norik.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202093230.3951996-1-andrej.picej@norik.com> References: <20211202093230.3951996-1-andrej.picej@norik.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel.siel.si X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - norik.com X-Get-Message-Sender-Via: cpanel.siel.si: authenticated_id: andrej.picej@norik.com X-Authenticated-Sender: cpanel.siel.si: andrej.picej@norik.com X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Enable system restart when the watchdog timeout occurs. Signed-off-by: Andrej Picej --- Chnages in v4: - no changes Changes in v3: - no changes Changes in v2: - new patch, enable shutdown mode for phytec-phycore (da9062 user) --- arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi index a80aa08a37cb..743343e525cf 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi @@ -111,6 +111,7 @@ da9062_onkey: onkey { watchdog { compatible = "dlg,da9062-watchdog"; dlg,use-sw-pm; + dlg,wdt-sd = <1>; }; regulators {