Skip to contentSkip to conversation

dt-binding: watchdog: add more Rockchip compatibles to snps,dw-wdt.yaml

PATCH Applied Johan Jonker 4 participants 16 messages Dec 18, 2020 – Mar 25, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/8 dt-binding: watchdog: add more Rockchip compatibles to snps,dw-wdt.yaml

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +6 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
   reg:
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 2/8 ARM: dts: rockchip: add new watchdog compatible to rv1108.dtsi

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip rv1108.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm/boot/dts/rv1108.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rv1108.dtsi +1 -1
index e491964b1..8ef8d038e 100644
@@ -300,7 +300,7 @@
 	};
 
 	watchdog: watchdog@10360000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,rv1108-wdt", "snps,dw-wdt";
 		reg = <0x10360000 0x100>;
 		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru PCLK_WDT>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

PATCH 3/8 ARM: dts: rockchip: add new watchdog compatible to rk322x.dtsi

In reply to Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip rk322x.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,rk3228-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm/boot/dts/rk322x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk322x.dtsi +1 -1
index 48e6e8d44..9910f9b5c 100644
@@ -385,7 +385,7 @@
 	};
 
 	wdt: watchdog@110a0000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,rk3228-wdt", "snps,dw-wdt";
 		reg = <0x110a0000 0x100>;
 		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru PCLK_CPU>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#3 lore raw

PATCH 4/8 arm64: dts: rockchip: add new watchdog compatible to px30.dtsi

In reply to Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip px30.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,px30-wdt", "snps,dw-wdt"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm64/boot/dts/rockchip/px30.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/px30.dtsi +1 -1
index af6bcef9e..541785425 100644
@@ -600,7 +600,7 @@
 	};
 
 	wdt: watchdog@ff1e0000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,px30-wdt", "snps,dw-wdt";
 		reg = <0x0 0xff1e0000 0x0 0x100>;
 		clocks = <&cru PCLK_WDT_NS>;
 		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#4 lore raw

PATCH 5/8 arm64: dts: rockchip: add new watchdog compatible to rk3308.dtsi

In reply to Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip rk3308.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,rk3308-wdt", "snps,dw-wdt"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm64/boot/dts/rockchip/rk3308.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3308.dtsi +1 -1
index 2560b9877..ad54acf5d 100644
@@ -244,7 +244,7 @@
 	};
 
 	wdt: watchdog@ff080000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,rk3308-wdt", "snps,dw-wdt";
 		reg = <0x0 0xff080000 0x0 0x100>;
 		clocks = <&cru PCLK_WDT>;
 		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#5 lore raw

PATCH 6/8 arm64: dts: rockchip: add new watchdog compatible to rk3328.dtsi

In reply to Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip rk3328.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,rk3328-wdt", "snps,dw-wdt"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +1 -1
index bbdb19a3e..1e3e1086e 100644
@@ -453,7 +453,7 @@
 	};
 
 	wdt: watchdog@ff1a0000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,rk3328-wdt", "snps,dw-wdt";
 		reg = <0x0 0xff1a0000 0x0 0x100>;
 		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru PCLK_WDT>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#6 lore raw

PATCH 7/8 arm64: dts: rockchip: add new watchdog compatible to rk3399.dtsi

In reply to Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip rk3399.dtsi file only the fallback string "snps,dw-wdt" is used, so add the new compatible string:

"rockchip,rk3399-wdt", "snps,dw-wdt"

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
index 2b99480ea..825eb254b 100644
@@ -1536,7 +1536,7 @@
 	};
 
 	watchdog@ff848000 {
-		compatible = "snps,dw-wdt";
+		compatible = "rockchip,rk3399-wdt", "snps,dw-wdt";
 		reg = <0x0 0xff848000 0x0 0x100>;
 		clocks = <&cru PCLK_WDT>;
 		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH 0>;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#7 lore raw

PATCH 8/8 ARM: dts: rockchip: remove clock-names property from watchdog node in rv1108.dtsi

In reply to Johan Jonker

A test with the command below gives this error:

/arch/arm/boot/dts/rv1108-evb.dt.yaml: watchdog@10360000:
clock-names:0: 'tclk' was expected

Comment from the dw_wdt.c file:

Try to request the watchdog dedicated timer clock source. It must be supplied if asynchronous mode is enabled. Otherwise fallback to the common timer/bus clocks configuration, in which the very first found clock supply both timer and APB signals.

Like in the other Rockchip watchdog nodes the property "clock-names" is not needed, so remove it.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 arch/arm/boot/dts/rv1108.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/rv1108.dtsi +0 -1
index 8ef8d038e..bec47e0be 100644
@@ -304,7 +304,6 @@
 		reg = <0x10360000 0x100>;
 		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cru PCLK_WDT>;
-		clock-names = "pclk_wdt";
 		status = "disabled";
 	};
 
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Acked-by on v1 1/8
#8 lore raw

Re: [PATCH 1/8] dt-binding: watchdog: add more Rockchip compatibles to snps, dw-wdt.yaml

In reply to Johan Jonker
Quoted 15 lines · Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 8 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer Reviewed-by on v1 1/8
#9 lore raw
In reply to Johan Jonker

Am Freitag, 18. Dezember 2020, 13:05:27 CET schrieb Johan Jonker:

Quoted 12 lines

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

Quoted 7 lines

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

I'd like to pick up the devicetree patches (2-8) once this has landed in the watchdog tree.

Thanks
Heiko

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer Reviewed-by on v1 1/8
#10 lore raw
In reply to Johan Jonker
Quoted 15 lines · Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 6 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 15 lines
---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +1 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml properties: · line 33

Quoted 10 lines
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +5 -0
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
   reg:

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#11 lore raw

Hi Guenter,

Am Samstag, 23. Januar 2021, 18:34:01 CET schrieb Guenter Roeck:

Quoted 16 lines · Johan Jonker
Quoted 15 lines

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 8 lines
Quoted 6 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

just to clarify, do you expect me to pick up the dt-binding patch with the devicetree patches or do you want to take this individual patch through the watchdog tree instead?

Thanks
Heiko

Quoted 24 lines
Quoted 24 lines
---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +6 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
Quoted 2 lines

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml properties: · line 33

Quoted 1 line
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +0 -0
   reg:

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#12 lore raw

Hi Heiko,

Quoted 26 lines · Heiko Stuebner

Hi Guenter,

Am Samstag, 23. Januar 2021, 18:34:01 CET schrieb Guenter Roeck:

Quoted 23 lines · Johan Jonker
Quoted 21 lines

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 6 lines
Quoted 1 line

just to clarify, do you expect me to pick up the dt-binding patch with the devicetree patches or do you want to take this individual patch through the watchdog tree instead?

You'd have to ask Wim since he takes care of actually sending pull requests. But didn't you say earlier that you wanted to apply the rest of the series after this one is applied through the watchdog tree ?

Thanks,
Guenter

Quoted 34 lines

Thanks
Heiko

Quoted 26 lines
Quoted 25 lines
---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +6 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
   reg:

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#13 lore raw

Hi Guenter,

Am Dienstag, 26. Januar 2021, 05:55:59 CET schrieb Guenter Roeck:

Quoted 27 lines · Heiko Stuebner
Quoted 26 lines

Am Samstag, 23. Januar 2021, 18:34:01 CET schrieb Guenter Roeck:

Quoted 24 lines · Johan Jonker
Quoted 15 lines

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 6 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 8 lines
Quoted 4 lines

just to clarify, do you expect me to pick up the dt-binding patch with the devicetree patches or do you want to take this individual patch through the watchdog tree instead?

You'd have to ask Wim since he takes care of actually sending pull requests. But didn't you say earlier that you wanted to apply the rest of the series after this one is applied through the watchdog tree ?

Yep that was my intent, though somehow I mistook you as also being a watchdog maintainer, hence the confusion.

So I'll wait for Wim to apply this patch and then I'll take the rest of the series.

Thanks
Heiko

Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +6 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml properties: · line 33

Quoted 1 line
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +0 -0
   reg:

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#14 lore raw
Quoted 35 lines · Heiko Stübner

Hi Guenter,

Am Dienstag, 26. Januar 2021, 05:55:59 CET schrieb Guenter Roeck:

Quoted 32 lines · Heiko Stuebner
Quoted 30 lines

Am Samstag, 23. Januar 2021, 18:34:01 CET schrieb Guenter Roeck:

Quoted 16 lines · Johan Jonker
Quoted 15 lines

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

Quoted 8 lines
Quoted 6 lines

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

just to clarify, do you expect me to pick up the dt-binding patch with the devicetree patches or do you want to take this individual patch through the watchdog tree instead?

Quoted 7 lines
Quoted 3 lines

You'd have to ask Wim since he takes care of actually sending pull requests. But didn't you say earlier that you wanted to apply the rest of the series after this one is applied through the watchdog tree ?

Yep that was my intent, though somehow I mistook you as also being a watchdog maintainer, hence the confusion.

I am, but Wim sends all pull requests.

Guenter

Quoted 43 lines

So I'll wait for Wim to apply this patch and then I'll take the rest of the series.

Thanks
Heiko

Quoted 32 lines
Quoted 30 lines
Quoted 26 lines
Quoted 25 lines
---
 Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml +6 -0
index f7ee9229c..b58596b18 100644
@@ -18,10 +18,16 @@ properties:
       - const: snps,dw-wdt
       - items:
           - enum:
+              - rockchip,px30-wdt
               - rockchip,rk3066-wdt
               - rockchip,rk3188-wdt
+              - rockchip,rk3228-wdt
               - rockchip,rk3288-wdt
+              - rockchip,rk3308-wdt
+              - rockchip,rk3328-wdt
               - rockchip,rk3368-wdt
+              - rockchip,rk3399-wdt
+              - rockchip,rv1108-wdt
           - const: snps,dw-wdt
 
   reg:

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer Applied
#15 lore raw

Re: (subset) [PATCH 1/8] dt-binding: watchdog: add more Rockchip compatibles to snps, dw-wdt.yaml

In reply to Johan Jonker
Quoted 5 lines · Johan Jonker

The watchdog compatible strings are suppose to be SoC orientated. In the more recently added Rockchip SoC dtsi files only the fallback string "snps,dw-wdt" is used, so add the following compatible strings:

Quoted 8 lines

"rockchip,px30-wdt", "snps,dw-wdt"
"rockchip,rk3228-wdt", "snps,dw-wdt"
"rockchip,rk3308-wdt", "snps,dw-wdt"
"rockchip,rk3328-wdt", "snps,dw-wdt"
"rockchip,rk3399-wdt", "snps,dw-wdt"
"rockchip,rv1108-wdt", "snps,dw-wdt"

[...]

Applied, thanks!

[2/8] ARM: dts: rockchip: add new watchdog compatible to rv1108.dtsi

      commit: 610e4c7215ddfa5c1bb52764717674ea8adb64f9
[3/8] ARM: dts: rockchip: add new watchdog compatible to rk322x.dtsi
      commit: 9ceb98f1ed19bc68129aa0db9da5adb4a40c0f1c
[4/8] arm64: dts: rockchip: add new watchdog compatible to px30.dtsi
      commit: d16c7082cff5e198f2435f08e2254e40f3058c75
[5/8] arm64: dts: rockchip: add new watchdog compatible to rk3308.dtsi
      commit: 58ead0c605e8a5f4139ed4dfffcdddac72e2eb31
[6/8] arm64: dts: rockchip: add new watchdog compatible to rk3328.dtsi
      commit: 2499448c920fc9648350d4f21e1fbd00ccd108ee
[7/8] arm64: dts: rockchip: add new watchdog compatible to rk3399.dtsi
      commit: 6b5c50863b3e6837f856a137fe6880ed4662335b
[8/8] ARM: dts: rockchip: remove clock-names property from watchdog node in rv1108.dtsi
      commit: 398a4087872a44921d0ede2afef53a3c9f779ab6

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip