Skip to contentSkip to conversation

dt-bindings: watchdog: fsl-imx: document i.MX compatibles

PATCH Applied Krzysztof Kozlowski 3 participants 8 messages Sep 26, 2020 – Oct 29, 2020

Subsystems (3)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dt-bindings: watchdog: fsl-imx: document i.MX compatibles

Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings like:

arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas

---
 .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +14 -0
index 991b4e33486e..a06e70f44fd0 100644
@@ -18,10 +18,24 @@ properties:
       - const: fsl,imx21-wdt
       - items:
           - enum:
+              - fsl,imx25-wdt
+              - fsl,imx27-wdt
+              - fsl,imx31-wdt
+              - fsl,imx35-wdt
+              - fsl,imx50-wdt
+              - fsl,imx51-wdt
+              - fsl,imx53-wdt
+              - fsl,imx6q-wdt
+              - fsl,imx6sl-wdt
+              - fsl,imx6sll-wdt
+              - fsl,imx6sx-wdt
+              - fsl,imx6ul-wdt
+              - fsl,imx7d-wdt
               - fsl,imx8mm-wdt
               - fsl,imx8mn-wdt
               - fsl,imx8mp-wdt
               - fsl,imx8mq-wdt
+              - fsl,vf610-wdt
           - const: fsl,imx21-wdt
 
   reg:
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/3 ARM: dts: imx: align watchdog node name with dtschema

The dtschema expects watchdog device node name to be "watchdog":

arch/arm/boot/dts/imx31-bug.dt.yaml: wdog@53fdc000:

    $nodename:0: 'wdog@53fdc000' does not match '^watchdog(@.*|-[0-9a-f])?$'
---
 arch/arm/boot/dts/imx25.dtsi | 2 +-
 arch/arm/boot/dts/imx27.dtsi | 2 +-
 arch/arm/boot/dts/imx31.dtsi | 3 ++-
 arch/arm/boot/dts/imx35.dtsi | 2 +-
 arch/arm/boot/dts/imx50.dtsi | 2 +-
 arch/arm/boot/dts/imx51.dtsi | 4 ++--
 arch/arm/boot/dts/imx53.dtsi | 4 ++--
 7 files changed, 10 insertions(+), 9 deletions(-)
arch/arm/boot/dts/imx25.dtsi +1 -1
index 1ab19f1268f8..fdcca82c9986 100644
@@ -525,7 +525,7 @@
 				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx25.bin";
 			};
 
-			wdog@53fdc000 {
+			watchdog@53fdc000 {
 				compatible = "fsl,imx25-wdt", "fsl,imx21-wdt";
 				reg = <0x53fdc000 0x4000>;
 				clocks = <&clks 126>;
arch/arm/boot/dts/imx27.dtsi +1 -1
index 7bc132737a37..fd525c3b16fa 100644
@@ -99,7 +99,7 @@
 				#dma-channels = <16>;
 			};
 
-			wdog: wdog@10002000 {
+			wdog: watchdog@10002000 {
 				compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
 				reg = <0x10002000 0x1000>;
 				interrupts = <27>;
arch/arm/boot/dts/imx31.dtsi +2 -1
index 45333f7e10ea..948d2a543f8d 100644
@@ -315,10 +315,11 @@
 				clock-names = "ref", "ipg";
 			};
 
-			wdog: wdog@53fdc000 {
+			wdog: watchdog@53fdc000 {
 				compatible = "fsl,imx31-wdt", "fsl,imx21-wdt";
 				reg = <0x53fdc000 0x4000>;
 				clocks = <&clks 41>;
+				interrupts = <55>;
 			};
 
 			pwm: pwm@53fe0000 {
arch/arm/boot/dts/imx35.dtsi +1 -1
index aba16252faab..98ccc81ca6d9 100644
@@ -294,7 +294,7 @@
 				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx35.bin";
 			};
 
-			wdog: wdog@53fdc000 {
+			wdog: watchdog@53fdc000 {
 				compatible = "fsl,imx35-wdt", "fsl,imx21-wdt";
 				reg = <0x53fdc000 0x4000>;
 				clocks = <&clks 74>;
arch/arm/boot/dts/imx50.dtsi +1 -1
index b6b2e6af9b96..a969f335b240 100644
@@ -267,7 +267,7 @@
 					      <&iomuxc 20 140 11>;
 			};
 
-			wdog1: wdog@53f98000 {
+			wdog1: watchdog@53f98000 {
 				compatible = "fsl,imx50-wdt", "fsl,imx21-wdt";
 				reg = <0x53f98000 0x4000>;
 				interrupts = <58>;
arch/arm/boot/dts/imx51.dtsi +2 -2
index 985e1be03ad6..7ebb46ce9e36 100644
@@ -370,14 +370,14 @@
 				status = "disabled";
 			};
 
-			wdog1: wdog@73f98000 {
+			wdog1: watchdog@73f98000 {
 				compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
 				reg = <0x73f98000 0x4000>;
 				interrupts = <58>;
 				clocks = <&clks IMX5_CLK_DUMMY>;
 			};
 
-			wdog2: wdog@73f9c000 {
+			wdog2: watchdog@73f9c000 {
 				compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
 				reg = <0x73f9c000 0x4000>;
 				interrupts = <59>;
arch/arm/boot/dts/imx53.dtsi +2 -2
index 500eeaa3a27c..000050aeeabe 100644
@@ -427,14 +427,14 @@
 				status = "disabled";
 			};
 
-			wdog1: wdog@53f98000 {
+			wdog1: watchdog@53f98000 {
 				compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
 				reg = <0x53f98000 0x4000>;
 				interrupts = <58>;
 				clocks = <&clks IMX5_CLK_DUMMY>;
 			};
 
-			wdog2: wdog@53f9c000 {
+			wdog2: watchdog@53f9c000 {
 				compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
 				reg = <0x53f9c000 0x4000>;
 				interrupts = <59>;
Signature · 1 line
2.17.1
Applied
#2 lore raw

Re: [PATCH 2/3] ARM: dts: imx: align watchdog node name with dtschema

Quoted 6 lines · Krzysztof Kozlowski

The dtschema expects watchdog device node name to be "watchdog":

arch/arm/boot/dts/imx31-bug.dt.yaml: wdog@53fdc000:

    $nodename:0: 'wdog@53fdc000' does not match '^watchdog(@.*|-[0-9a-f])?$'

Applied, thanks.

#3 lore raw

PATCH 3/3 ARM: dts: vf: align watchdog node name with dtschema

In reply to Krzysztof Kozlowski

The dtschema expects watchdog device node name to be "watchdog":

arch/arm/boot/dts/vf500-colibri-eval-v3.dt.yaml: wdog@4003e000:

    $nodename:0: 'wdog@4003e000' does not match '^watchdog(@.*|-[0-9a-f])?$'
---
 arch/arm/boot/dts/vfxxx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/vfxxx.dtsi +1 -1
index 2259d11af721..0c8d15fd9253 100644
@@ -293,7 +293,7 @@
 				status = "disabled";
 			};
 
-			wdoga5: wdog@4003e000 {
+			wdoga5: watchdog@4003e000 {
 				compatible = "fsl,vf610-wdt", "fsl,imx21-wdt";
 				reg = <0x4003e000 0x1000>;
 				interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.17.1
Applied
#4 lore raw

Re: [PATCH 3/3] ARM: dts: vf: align watchdog node name with dtschema

Quoted 6 lines · Krzysztof Kozlowski

The dtschema expects watchdog device node name to be "watchdog":

arch/arm/boot/dts/vf500-colibri-eval-v3.dt.yaml: wdog@4003e000:

    $nodename:0: 'wdog@4003e000' does not match '^watchdog(@.*|-[0-9a-f])?$'

Applied, thanks.

maintainer Reviewed-by on v1 1/3
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 4 lines · Krzysztof Kozlowski

Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings like:

Quoted 8 lines

arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas

---
 .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
#6 lore raw
In reply to Krzysztof Kozlowski
Quoted 27 lines · Krzysztof Kozlowski

Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings like:

arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas

---
 .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +7 -0
index 991b4e33486e..a06e70f44fd0 100644
@@ -18,10 +18,24 @@ properties:
       - const: fsl,imx21-wdt
       - items:
           - enum:
+              - fsl,imx25-wdt
+              - fsl,imx27-wdt
+              - fsl,imx31-wdt
+              - fsl,imx35-wdt
+              - fsl,imx50-wdt
+              - fsl,imx51-wdt
+              - fsl,imx53-wdt

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml properties: · line 37

Quoted 10 lines
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +6 -0
+              - fsl,imx6q-wdt
+              - fsl,imx6sl-wdt
+              - fsl,imx6sll-wdt
+              - fsl,imx6sx-wdt
+              - fsl,imx6ul-wdt
+              - fsl,imx7d-wdt
               - fsl,imx8mm-wdt
               - fsl,imx8mn-wdt
               - fsl,imx8mp-wdt
               - fsl,imx8mq-wdt

Could you add the following two as well?

- fsl,ls1012a-wdt
- fsl,ls1043a-wdt

Shawn

Quoted 7 lines
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +1 -0
+              - fsl,vf610-wdt
           - const: fsl,imx21-wdt
 
   reg:
Signature · 1 line
2.17.1
#7 lore raw
Quoted 41 lines · Shawn Guo
Quoted 27 lines · Krzysztof Kozlowski

Document all ARMv5, ARMv6 and ARMv7 i.MX compatibles used in DTSes (even though driver binds only to fsl,imx21-wdt) to fix dtbs_check warnings like:

arch/arm/boot/dts/imx53-qsb.dt.yaml: gpio@53fe0000: compatible:
['fsl,imx53-gpio', 'fsl,imx35-gpio'] is not valid under any of the given schemas

---
 .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +7 -0
index 991b4e33486e..a06e70f44fd0 100644
@@ -18,10 +18,24 @@ properties:
       - const: fsl,imx21-wdt
       - items:
           - enum:
+              - fsl,imx25-wdt
+              - fsl,imx27-wdt
+              - fsl,imx31-wdt
+              - fsl,imx35-wdt
+              - fsl,imx50-wdt
+              - fsl,imx51-wdt
+              - fsl,imx53-wdt

Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml properties: · line 37

Quoted 10 lines
Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml +6 -0
+              - fsl,imx6q-wdt
+              - fsl,imx6sl-wdt
+              - fsl,imx6sll-wdt
+              - fsl,imx6sx-wdt
+              - fsl,imx6ul-wdt
+              - fsl,imx7d-wdt
               - fsl,imx8mm-wdt
               - fsl,imx8mn-wdt
               - fsl,imx8mp-wdt
               - fsl,imx8mq-wdt

Could you add the following two as well?

Quoted 2 lines

- fsl,ls1012a-wdt
- fsl,ls1043a-wdt

I focused in these patches on i.MX but I can fix the Layerscape as well.

Best regards,
Krzysztof