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])?$'

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 1ab19f1..fdcca82 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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>;

diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 7bc1327..fd525c3 100644 (file)
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -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>;

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 45333f7..948d2a5 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -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 {

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index aba1625..98ccc81 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -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>;

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index b6b2e6a..a969f33 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -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>;

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 985e1be..7ebb46c 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -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>;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 500eeaa..000050a 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -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>;