Merge tag 'linux-watchdog-5.16-rc1' of git://www.linux-watchdog.org/linux-watchdog

[platform/kernel/linux-starfive.git] / drivers / watchdog / mtk_wdt.c

diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 3d208d6..543cf38 100644 (file)
--- 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;
 }