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

Commit 6aed43ff authored by Philipp Zabel's avatar Philipp Zabel Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt 



[ Upstream commit 397caf68e2d36532054cb14ae8995537f27f8b61 ]

The timer nodes declare compatibility with "fsl,imx6sx-gpt", which
itself is compatible with "fsl,imx6dl-gpt". Switch the fallback
compatible from "fsl,imx6sx-gpt" to "fsl,imx6dl-gpt".

Fixes: 94967345 ("ARM: dts: add imx7d soc dtsi file")
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarRoland Hieber <rhi@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 45630646

arch/arm/boot/dts/imx7s.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ 
			};



			gpt1: timer@302d0000 {

				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";

				reg = <0x302d0000 0x10000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
@@ -449,7 +449,7 @@ 
			};



			gpt2: timer@302e0000 {

				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";

				reg = <0x302e0000 0x10000>;

				interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
@@ -459,7 +459,7 @@ 
			};



			gpt3: timer@302f0000 {

				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";

				reg = <0x302f0000 0x10000>;

				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
@@ -469,7 +469,7 @@ 
			};



			gpt4: timer@30300000 {

				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";

				reg = <0x30300000 0x10000>;

				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_GPT4_ROOT_CLK>,