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

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

ARM: dts: imx7s: Correct GPT's ipg clock source 



[ Upstream commit 252b9e21bcf46b0d16f733f2e42b21fdc60addee ]

i.MX7S/D's GPT ipg clock should be from GPT clock root and
controlled by CCM's GPT CCGR, using correct clock source for
GPT ipg clock instead of IMX7D_CLK_DUMMY.

Fixes: 3ef79ca6 ("ARM: dts: imx7d: use imx7s.dtsi as base device tree")
Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b4bd4ac9

arch/arm/boot/dts/imx7s.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				reg = <0x302d0000 0x10000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_CLK_DUMMY>,

				clocks = <&clks IMX7D_GPT1_ROOT_CLK>,

					 <&clks IMX7D_GPT1_ROOT_CLK>;

				clock-names = "ipg", "per";

			};
@@ -446,7 +446,7 @@ 
				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				reg = <0x302e0000 0x10000>;

				interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_CLK_DUMMY>,

				clocks = <&clks IMX7D_GPT2_ROOT_CLK>,

					 <&clks IMX7D_GPT2_ROOT_CLK>;

				clock-names = "ipg", "per";

				status = "disabled";
@@ -456,7 +456,7 @@ 
				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				reg = <0x302f0000 0x10000>;

				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_CLK_DUMMY>,

				clocks = <&clks IMX7D_GPT3_ROOT_CLK>,

					 <&clks IMX7D_GPT3_ROOT_CLK>;

				clock-names = "ipg", "per";

				status = "disabled";
@@ -466,7 +466,7 @@ 
				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";

				reg = <0x30300000 0x10000>;

				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_CLK_DUMMY>,

				clocks = <&clks IMX7D_GPT4_ROOT_CLK>,

					 <&clks IMX7D_GPT4_ROOT_CLK>;

				clock-names = "ipg", "per";

				status = "disabled";