Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45630646 authored by Anson Huang's avatar Anson Huang Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx: make gpt node name generic 



[ Upstream commit 7c48b086965873c0aa93d99773cf64c033b76b2f ]

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

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Stable-dep-of: 397caf68e2d3 ("ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 47aedb4c

arch/arm/boot/dts/imx6qdl.dtsi

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

arch/arm/boot/dts/imx6sl.dtsi

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

arch/arm/boot/dts/imx6sx.dtsi

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

arch/arm/boot/dts/imx6ul.dtsi

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

arch/arm/boot/dts/imx7s.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -439,7 +439,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>;
@@ -448,7 +448,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>;
@@ -458,7 +458,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>;
@@ -468,7 +468,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>;