From: Andrej Picej <andrej.picej@norik.com> 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 [thread overview] Message-ID: <20211202093230.3951996-2-andrej.picej@norik.com> (raw) In-Reply-To: <20211202093230.3951996-1-andrej.picej@norik.com> 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 <andrej.picej@norik.com> --- 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); } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrej Picej <andrej.picej@norik.com> 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 [thread overview] Message-ID: <20211202093230.3951996-2-andrej.picej@norik.com> (raw) In-Reply-To: <20211202093230.3951996-1-andrej.picej@norik.com> 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 <andrej.picej@norik.com> --- 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); } -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-12-02 9:32 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-02 9:32 [PATCH v4 1/4] mfd: da9062: make register CONFIG_I writable Andrej Picej 2021-12-02 9:32 ` Andrej Picej 2021-12-02 9:32 ` Andrej Picej [this message] 2021-12-02 9:32 ` [PATCH v4 2/4] watchdog: da9062: reset board on watchdog timeout Andrej Picej 2021-12-02 12:18 ` Adam Thomson 2021-12-02 12:18 ` Adam Thomson 2021-12-02 12:25 ` Andrej Picej 2021-12-02 12:25 ` Andrej Picej 2021-12-02 14:41 ` Guenter Roeck 2021-12-02 14:41 ` Guenter Roeck 2021-12-02 9:32 ` [PATCH v4 3/4] dt-bindings: watchdog: da9062: add watchdog timeout mode Andrej Picej 2021-12-02 9:32 ` Andrej Picej 2021-12-02 12:19 ` Adam Thomson 2021-12-02 12:19 ` Adam Thomson 2021-12-02 9:32 ` [PATCH v4 4/4] ARM: dts: imx6: phycore-som: set watchdog timeout mode to shutdown Andrej Picej 2021-12-02 9:32 ` Andrej Picej 2021-12-02 12:14 ` [PATCH v4 1/4] mfd: da9062: make register CONFIG_I writable Adam Thomson 2021-12-02 12:14 ` Adam Thomson 2021-12-02 14:40 ` Guenter Roeck 2021-12-02 14:40 ` Guenter Roeck 2021-12-02 15:18 ` Christoph Niedermaier 2021-12-03 8:59 ` Andrej Picej 2021-12-03 8:59 ` Andrej Picej 2021-12-03 15:04 ` Guenter Roeck 2021-12-03 15:04 ` Guenter Roeck
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211202093230.3951996-2-andrej.picej@norik.com \ --to=andrej.picej@norik.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=support.opensource@diasemi.com \ --cc=wim@linux-watchdog.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.