| From 75a02db827de7e5a173668ac3eb276feb1f03031 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 7 Oct 2019 08:43:42 +0800 |
| Subject: ARM: dts: imx7s: Correct GPT's ipg clock source |
| |
| From: Anson Huang <Anson.Huang@nxp.com> |
| |
| [ 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: 3ef79ca6bd1d ("ARM: dts: imx7d: use imx7s.dtsi as base device tree") |
| Signed-off-by: Anson Huang <Anson.Huang@nxp.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/imx7s.dtsi | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi |
| index bf15efbe8a710..836550f2297ac 100644 |
| --- a/arch/arm/boot/dts/imx7s.dtsi |
| +++ b/arch/arm/boot/dts/imx7s.dtsi |
| @@ -450,7 +450,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"; |
| }; |
| @@ -459,7 +459,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"; |
| @@ -469,7 +469,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"; |
| @@ -479,7 +479,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"; |
| -- |
| 2.20.1 |
| |
