ARM: dts: imx: make wdog node name generic

Node name should be generic, use "watchdog" instead of "wdog" for
wdog nodes.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 97c0a8551c87e9a66de14dfd3da61d3e05dddb5d..886ab8104a8cea974713f69c4c60704a167d3ac9 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -669,14 +669,14 @@
                                status = "disabled";
                        };
 
-                       wdog1: wdog@20bc000 {
+                       wdog1: watchdog@20bc000 {
                                compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6QDL_CLK_IPG>;
                        };
 
-                       wdog2: wdog@20c0000 {
+                       wdog2: watchdog@20c0000 {
                                compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
                                reg = <0x020c0000 0x4000>;
                                interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ea889f75e09b7f30d85fad64f902595ebda27143..db626b2dcb2b097133cec0965ee8029cd871a106 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -499,14 +499,14 @@
                                status = "disabled";
                        };
 
-                       wdog1: wdog@20bc000 {
+                       wdog1: watchdog@20bc000 {
                                compatible = "fsl,imx6sl-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_IPG>;
                        };
 
-                       wdog2: wdog@20c0000 {
+                       wdog2: watchdog@20c0000 {
                                compatible = "fsl,imx6sl-wdt", "fsl,imx21-wdt";
                                reg = <0x020c0000 0x4000>;
                                interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 1198117a4728f9df37acc5423f15322fe032c7e4..6db9ca092cc7c8ec9741d9dca356de14aa8b1b39 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -567,14 +567,14 @@
                                status = "disabled";
                        };
 
-                       wdog1: wdog@20bc000 {
+                       wdog1: watchdog@20bc000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_IPG>;
                        };
 
-                       wdog2: wdog@20c0000 {
+                       wdog2: watchdog@20c0000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x020c0000 0x4000>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -1289,7 +1289,7 @@
                                status = "disabled";
                        };
 
-                       wdog3: wdog@2288000 {
+                       wdog3: watchdog@2288000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x02288000 0x4000>;
                                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 30cce35c6b3ce2a8781a8b935455e35d4d995512..e1807e9d385a036fdc313169ba8ee9fbb3d7cd1d 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -531,14 +531,14 @@
                                status = "disabled";
                        };
 
-                       wdog1: wdog@20bc000 {
+                       wdog1: watchdog@20bc000 {
                                compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6UL_CLK_WDOG1>;
                        };
 
-                       wdog2: wdog@20c0000 {
+                       wdog2: watchdog@20c0000 {
                                compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
                                reg = <0x020c0000 0x4000>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
@@ -1007,7 +1007,7 @@
                                status = "disabled";
                        };
 
-                       wdog3: wdog@21e4000 {
+                       wdog3: watchdog@21e4000 {
                                compatible = "fsl,imx6ul-wdt", "fsl,imx21-wdt";
                                reg = <0x021e4000 0x4000>;
                                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 1ac5045812bf1c94a4c28e1e623fb5374a074f23..196bbd6f6fccd0ba2c824bb50681b456f5459eb1 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -406,14 +406,14 @@
                                gpio-ranges = <&iomuxc 0 139 16>;
                        };
 
-                       wdog1: wdog@30280000 {
+                       wdog1: watchdog@30280000 {
                                compatible = "fsl,imx7d-wdt", "fsl,imx21-wdt";
                                reg = <0x30280000 0x10000>;
                                interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX7D_WDOG1_ROOT_CLK>;
                        };
 
-                       wdog2: wdog@30290000 {
+                       wdog2: watchdog@30290000 {
                                compatible = "fsl,imx7d-wdt", "fsl,imx21-wdt";
                                reg = <0x30290000 0x10000>;
                                interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -421,7 +421,7 @@
                                status = "disabled";
                        };
 
-                       wdog3: wdog@302a0000 {
+                       wdog3: watchdog@302a0000 {
                                compatible = "fsl,imx7d-wdt", "fsl,imx21-wdt";
                                reg = <0x302a0000 0x10000>;
                                interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
@@ -429,7 +429,7 @@
                                status = "disabled";
                        };
 
-                       wdog4: wdog@302b0000 {
+                       wdog4: watchdog@302b0000 {
                                compatible = "fsl,imx7d-wdt", "fsl,imx21-wdt";
                                reg = <0x302b0000 0x10000>;
                                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;