Commit bffe02cc authored by Anson Huang's avatar Anson Huang Committed by Shawn Guo
Browse files

ARM: dts: imx: make wdog node name generic 



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

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 1608bf1f

arch/arm/boot/dts/imx6qdl.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/imx6sl.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/imx6sx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/imx6ul.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/imx7s.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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>;