2021-09-14 12:37:17

by Fengquan Chen

Subject: [v3,0/2] update mediatek wdt driver and dt-binding

1. update watchdog dt-binding
2. add disable_wdt_extrst to support disable reset signal output

fengquan.chen (2):
dt-bindings: watchdog: mtk-wdt: add disable_wdt_extrst support
watchdog: mtk: add disable_wdt_extrst support

Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 2 ++
drivers/watchdog/mtk_wdt.c | 7 +++++++
2 files changed, 9 insertions(+)

--
2.25.1

2021-09-14 12:37:40

by Fengquan Chen

Subject: [v3,2/2] watchdog: mtk: add disable_wdt_extrst support

In some cases, we may need watchdog just to trigger an
internal soc reset without sending any output signal.

Provide a disable_wdt_extrst parameter for configuration.
We can disable or enable it just by configuring dts.

Signed-off-by: Fengquan Chen <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
---
drivers/watchdog/mtk_wdt.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 796fbb048cbe..ceb57ea627cd 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -65,6 +65,7 @@ struct mtk_wdt_dev {
void __iomem *wdt_base;
spinlock_t lock; /* protects WDT_SWSYSRST reg */
struct reset_controller_dev rcdev;
+ bool disable_wdt_extrst;
};

struct mtk_wdt_data {
@@ -256,6 +257,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
reg |= (WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN);
else
reg &= ~(WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN);
+ if (mtk_wdt->disable_wdt_extrst)
+ reg &= ~WDT_MODE_EXRST_EN;
reg |= (WDT_MODE_EN | WDT_MODE_KEY);
iowrite32(reg, wdt_base + WDT_MODE);

@@ -381,6 +384,10 @@ static int mtk_wdt_probe(struct platform_device *pdev)
if (err)
return err;
}
+
+ mtk_wdt->disable_wdt_extrst =
+ of_property_read_bool(dev->of_node, "mediatek,disable-extrst");
+
return 0;
}

--
2.25.1