ARM: dts: imx: make gpt node name generic

Node name should be generic, use "timer" instead of "gpt" for gpt node.

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 bf9d20f210608e28e6bc1af64244449b56450258..1fc5cc2fffb8d4116bba17c7931905fe10cce601 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -574,7 +574,7 @@
                                status = "disabled";
                        };
 
-                       gpt: gpt@2098000 {
+                       gpt: timer@2098000 {
                                compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
                                reg = <0x02098000 0x4000>;
                                interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 5b26c8d756262d067178d37623121d73a9cdc574..75e46e92c182f4da7e6748d6e8a1f9e1e7eda46f 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -380,7 +380,7 @@
                                clock-names = "ipg", "per";
                        };
 
-                       gpt: gpt@2098000 {
+                       gpt: timer@2098000 {
                                compatible = "fsl,imx6sl-gpt";
                                reg = <0x02098000 0x4000>;
                                interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 98de781b8082e756b061a29c1d3da565adce26cd..73423cca9b969c7e602e375e41992a6985c1df42 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -466,7 +466,7 @@
                                status = "disabled";
                        };
 
-                       gpt: gpt@2098000 {
+                       gpt: timer@2098000 {
                                compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
                                reg = <0x02098000 0x4000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index beb82d357f37c50a213a5b03aaae20d2ae4408a0..67b2bab8c155ef61a266e1a1dfe2f015166ebd98 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -430,7 +430,7 @@
                                status = "disabled";
                        };
 
-                       gpt1: gpt@2098000 {
+                       gpt1: timer@2098000 {
                                compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
                                reg = <0x02098000 0x4000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -704,7 +704,7 @@
                                reg = <0x020e4000 0x4000>;
                        };
 
-                       gpt2: gpt@20e8000 {
+                       gpt2: timer@20e8000 {
                                compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
                                reg = <0x020e8000 0x4000>;
                                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index f959f69b067767799d95b2fea27bdcabcac37e7c..8e59da4f05c9059c9c137d9f088a94d193e4dd73 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -443,7 +443,7 @@
                                fsl,input-sel = <&iomuxc>;
                        };
 
-                       gpt1: gpt@302d0000 {
+                       gpt1: timer@302d0000 {
                                compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                reg = <0x302d0000 0x10000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -452,7 +452,7 @@
                                clock-names = "ipg", "per";
                        };
 
-                       gpt2: gpt@302e0000 {
+                       gpt2: timer@302e0000 {
                                compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                reg = <0x302e0000 0x10000>;
                                interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -462,7 +462,7 @@
                                status = "disabled";
                        };
 
-                       gpt3: gpt@302f0000 {
+                       gpt3: timer@302f0000 {
                                compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                reg = <0x302f0000 0x10000>;
                                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
@@ -472,7 +472,7 @@
                                status = "disabled";
                        };
 
-                       gpt4: gpt@30300000 {
+                       gpt4: timer@30300000 {
                                compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
                                reg = <0x30300000 0x10000>;
                                interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;