[v2,0/2] update mediatek wdt driver and dt-binding

6 messages, 3 authors, 2021-09-14 · open the first message on its own page

[v2,0/2] update mediatek wdt driver and dt-binding

From: Fengquan Chen <hidden>
Date: 2021-09-03 06:16:45

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

fengquan.chen (2):
  watchdog: mtk: add disable_wdt_extrst support
  dt-bindings: watchdog: mtk-wdt: 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[v2,1/2] watchdog: mtk: add disable_wdt_extrst support

From: Fengquan Chen <hidden>
Date: 2021-09-03 06:16:57

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 <redacted>
---
 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 97ca993bd009..276b6cb7d225 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c

@@ -63,6 +63,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 {

@@ -240,6 +241,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
 
 	reg = ioread32(wdt_base + WDT_MODE);
 	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);

@@ -309,6 +312,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[v2,2/2] dt-bindings: watchdog: mtk-wdt: add disable_wdt_extrst support

From: Fengquan Chen <hidden>
Date: 2021-09-03 06:17:20

This patch add a description and example of disable_wdt_extrst
element for watchdog on MTK Socs

Signed-off-by: fengquan.chen <redacted>
---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
index e36ba60de829..c202d6fa5801 100644
--- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

@@ -17,6 +17,7 @@ Required properties:
 - reg : Specifies base physical address and size of the registers.
 
 Optional properties:
+- mediatek,disable-extrst: disable send output reset signal
 - timeout-sec: contains the watchdog timeout in seconds.
 - #reset-cells: Should be 1.

@@ -25,6 +26,7 @@ Example:
 watchdog: watchdog@10007000 {
 	compatible = "mediatek,mt8183-wdt",
 		     "mediatek,mt6589-wdt";
+	mediatek,disable-extrst;
 	reg = <0 0x10007000 0 0x100>;
 	timeout-sec = <10>;
 	#reset-cells = <1>;

-- 
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [v2,1/2] watchdog: mtk: add disable_wdt_extrst support

From: Guenter Roeck <linux@roeck-us.net>
Date: 2021-09-03 14:05:10

On 9/2/21 11:16 PM, Fengquan Chen wrote:

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 <redacted>

Nit: You should set up git such that it uses "Fengquan Chen", not
"fengquan.chen".

Other than that, for my reference,

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

We'll have to wait for dt property approval before we can apply the patch.

Thanks,
Guenter

quoted hunk

---
  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 97ca993bd009..276b6cb7d225 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c

@@ -63,6 +63,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 {

@@ -240,6 +241,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
  
  	reg = ioread32(wdt_base + WDT_MODE);
  	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);

@@ -309,6 +312,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;
  }


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [v2,2/2] dt-bindings: watchdog: mtk-wdt: add disable_wdt_extrst support

From: Rob Herring <robh@kernel.org>
Date: 2021-09-07 19:28:22

On Fri, 03 Sep 2021 14:16:23 +0800, Fengquan Chen wrote:

This patch add a description and example of disable_wdt_extrst
element for watchdog on MTK Socs

Signed-off-by: fengquan.chen <redacted>
---
 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 2 ++
 1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [v2,1/2] watchdog: mtk: add disable_wdt_extrst support

From: Fengquan Chen <hidden>
Date: 2021-09-14 12:51:42

On Fri, 2021-09-03 at 07:05 -0700, Guenter Roeck wrote:

On 9/2/21 11:16 PM, Fengquan Chen wrote:

quoted

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 <redacted>

Nit: You should set up git such that it uses "Fengquan Chen", not
"fengquan.chen".

Other than that, for my reference,

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

We'll have to wait for dt property approval before we can apply the
patch.

Thanks,
Guenter

Thanks, i have uploaded a new v3 to fix the signed-off name,
and move the dt-binding patch to the first patch.

Best Regards
Fengquan

quoted

---
  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 97ca993bd009..276b6cb7d225 100644

--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c

@@ -63,6 +63,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 {

@@ -240,6 +241,8 @@ static int mtk_wdt_start(struct watchdog_device

*wdt_dev)
  
  	reg = ioread32(wdt_base + WDT_MODE);
  	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);

@@ -309,6 +312,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;
  }

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help