Skip to content

Commit 439166b

Browse files
pH5gregkh
authored andcommitted
ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt
[ Upstream commit 397caf6 ] 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: 9496734 ("ARM: dts: add imx7d soc dtsi file") Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Roland Hieber <rhi@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4fe36f8 commit 439166b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm/boot/dts/imx7s.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
};
448448

449449
gpt1: timer@302d0000 {
450-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
450+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
451451
reg = <0x302d0000 0x10000>;
452452
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
453453
clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
@@ -456,7 +456,7 @@
456456
};
457457

458458
gpt2: timer@302e0000 {
459-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
459+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
460460
reg = <0x302e0000 0x10000>;
461461
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
462462
clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
@@ -466,7 +466,7 @@
466466
};
467467

468468
gpt3: timer@302f0000 {
469-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
469+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
470470
reg = <0x302f0000 0x10000>;
471471
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
472472
clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
@@ -476,7 +476,7 @@
476476
};
477477

478478
gpt4: timer@30300000 {
479-
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
479+
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
480480
reg = <0x30300000 0x10000>;
481481
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
482482
clocks = <&clks IMX7D_GPT4_ROOT_CLK>,

0 commit comments

Comments
 (0)