1. Patchew
  2. linux
  3. [PATCH 0/4] powerpc: Rename wdt@ notes to watchdog@
  4. View patch

[PATCH 3/4] powerpc: 86xx: Rename wdt@ nodes to watchdog@

J. Neuschäfer via B4 Relay posted 4 patches 7 months, 4 weeks ago
[PATCH 3/4] powerpc: 86xx: Rename wdt@ nodes to watchdog@
Posted by J. Neuschäfer via B4 Relay 7 months, 4 weeks ago 
From: "J. Neuschäfer" <j.ne@posteo.net>

The watchdog.yaml schema prescribes a node name of "timer" or "watchdog"
rather than the abbreviation "wdt".

Signed-off-by: J. Neuschäfer <j.ne@posteo.net>
---
 arch/powerpc/boot/dts/fsl/gef_ppc9a.dts  | 4 ++--
 arch/powerpc/boot/dts/fsl/gef_sbc310.dts | 4 ++--
 arch/powerpc/boot/dts/fsl/gef_sbc610.dts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
index fc92bb032c517a543d6e1e498ab903f1937414f8..48a81430a8a31fc29b53fba03986b2fb984b66c1 100644
--- a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
@@ -82,7 +82,7 @@ fpga@4,0 {
 			reg = <0x4 0x0 0x40>;
 		};
 
-		wdt@4,2000 {
+		watchdog@4,2000 {
 			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
 				"gef,fpga-wdt";
 			reg = <0x4 0x2000 0x8>;
@@ -90,7 +90,7 @@ wdt@4,2000 {
 			interrupt-parent = <&gef_pic>;
 		};
 		/* Second watchdog available, driver currently supports one.
-		wdt@4,2010 {
+		watchdog@4,2010 {
 			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
 				"gef,fpga-wdt";
 			reg = <0x4 0x2010 0x8>;
diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
index 47ae85c34635bb0165004e52d15df92542406b15..8eb254b1738dde7327d5e3fc07b4bbba137b4d9c 100644
--- a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
@@ -79,7 +79,7 @@ fpga@4,0 {
 			reg = <0x4 0x0 0x40>;
 		};
 
-		wdt@4,2000 {
+		watchdog@4,2000 {
 			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
 				"gef,fpga-wdt";
 			reg = <0x4 0x2000 0x8>;
@@ -87,7 +87,7 @@ wdt@4,2000 {
 			interrupt-parent = <&gef_pic>;
 		};
 /*
-		wdt@4,2010 {
+		watchdog@4,2010 {
 			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
 				"gef,fpga-wdt";
 			reg = <0x4 0x2010 0x8>;
diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
index 5322be44b62e78bebac0fa92c0de05094b186dde..02edbb262b8f00279dea024700eebf874501f6d5 100644
--- a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
@@ -82,14 +82,14 @@ fpga@4,0 {
 			reg = <0x4 0x0 0x40>;
 		};
 
-		wdt@4,2000 {
+		watchdog@4,2000 {
 			compatible = "gef,fpga-wdt";
 			reg = <0x4 0x2000 0x8>;
 			interrupts = <0x1a 0x4>;
 			interrupt-parent = <&gef_pic>;
 		};
 		/* Second watchdog available, driver currently supports one.
-		wdt@4,2010 {
+		watchdog@4,2010 {
 			compatible = "gef,fpga-wdt";
 			reg = <0x4 0x2010 0x8>;
 			interrupts = <0x1b 0x4>;

-- 
2.48.0.rc1.219.gb6b6757d772
Re: [PATCH 3/4] powerpc: 86xx: Rename wdt@ nodes to watchdog@
Posted by Christophe Leroy 2 months ago 

Le 18/04/2025 à 21:28, J. Neuschäfer via B4 Relay a écrit :
> From: "J. Neuschäfer" <j.ne@posteo.net>
> 
> The watchdog.yaml schema prescribes a node name of "timer" or "watchdog"
> rather than the abbreviation "wdt".
> 
> Signed-off-by: J. Neuschäfer <j.ne@posteo.net>

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
>   arch/powerpc/boot/dts/fsl/gef_ppc9a.dts  | 4 ++--
>   arch/powerpc/boot/dts/fsl/gef_sbc310.dts | 4 ++--
>   arch/powerpc/boot/dts/fsl/gef_sbc610.dts | 4 ++--
>   3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
> index fc92bb032c517a543d6e1e498ab903f1937414f8..48a81430a8a31fc29b53fba03986b2fb984b66c1 100644
> --- a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
> +++ b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
> @@ -82,7 +82,7 @@ fpga@4,0 {
>   			reg = <0x4 0x0 0x40>;
>   		};
>   
> -		wdt@4,2000 {
> +		watchdog@4,2000 {
>   			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
>   				"gef,fpga-wdt";
>   			reg = <0x4 0x2000 0x8>;
> @@ -90,7 +90,7 @@ wdt@4,2000 {
>   			interrupt-parent = <&gef_pic>;
>   		};
>   		/* Second watchdog available, driver currently supports one.
> -		wdt@4,2010 {
> +		watchdog@4,2010 {
>   			compatible = "gef,ppc9a-fpga-wdt", "gef,fpga-wdt-1.00",
>   				"gef,fpga-wdt";
>   			reg = <0x4 0x2010 0x8>;
> diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
> index 47ae85c34635bb0165004e52d15df92542406b15..8eb254b1738dde7327d5e3fc07b4bbba137b4d9c 100644
> --- a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
> +++ b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
> @@ -79,7 +79,7 @@ fpga@4,0 {
>   			reg = <0x4 0x0 0x40>;
>   		};
>   
> -		wdt@4,2000 {
> +		watchdog@4,2000 {
>   			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
>   				"gef,fpga-wdt";
>   			reg = <0x4 0x2000 0x8>;
> @@ -87,7 +87,7 @@ wdt@4,2000 {
>   			interrupt-parent = <&gef_pic>;
>   		};
>   /*
> -		wdt@4,2010 {
> +		watchdog@4,2010 {
>   			compatible = "gef,sbc310-fpga-wdt", "gef,fpga-wdt-1.00",
>   				"gef,fpga-wdt";
>   			reg = <0x4 0x2010 0x8>;
> diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
> index 5322be44b62e78bebac0fa92c0de05094b186dde..02edbb262b8f00279dea024700eebf874501f6d5 100644
> --- a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
> +++ b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
> @@ -82,14 +82,14 @@ fpga@4,0 {
>   			reg = <0x4 0x0 0x40>;
>   		};
>   
> -		wdt@4,2000 {
> +		watchdog@4,2000 {
>   			compatible = "gef,fpga-wdt";
>   			reg = <0x4 0x2000 0x8>;
>   			interrupts = <0x1a 0x4>;
>   			interrupt-parent = <&gef_pic>;
>   		};
>   		/* Second watchdog available, driver currently supports one.
> -		wdt@4,2010 {
> +		watchdog@4,2010 {
>   			compatible = "gef,fpga-wdt";
>   			reg = <0x4 0x2010 0x8>;
>   			interrupts = <0x1b 0x4>;
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.