]>
Commit | Line | Data |
---|---|---|
37554d48 SL |
1 | From 7930cdd19d60b78df445a153e0468c7baa256e09 Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Smirnov <andrew.smirnov@gmail.com> | |
3 | Date: Thu, 28 Mar 2019 23:49:18 -0700 | |
4 | Subject: ARM: dts: imx7d: Specify IMX7D_CLK_IPG as "ipg" clock to SDMA | |
5 | ||
6 | [ Upstream commit 412b032a1dc72fc9d1c258800355efa6671b6315 ] | |
7 | ||
8 | Since 25aaa75df1e6 SDMA driver uses clock rates of "ipg" and "ahb" | |
9 | clock to determine if it needs to configure the IP block as operating | |
10 | at 1:1 or 1:2 clock ratio (ACR bit in SDMAARM_CONFIG). Specifying both | |
11 | clocks as IMX7D_CLK_SDMA results in driver incorrectly thinking that | |
12 | ratio is 1:1 which results in broken SDMA funtionality. Fix the code | |
13 | to specify IMX7D_CLK_IPG as "ipg" clock for SDMA, to avoid detecting | |
14 | incorrect clock ratio. | |
15 | ||
16 | Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> | |
17 | Cc: Angus Ainslie (Purism) <angus@akkea.ca> | |
18 | Cc: Chris Healy <cphealy@gmail.com> | |
19 | Cc: Lucas Stach <l.stach@pengutronix.de> | |
20 | Cc: Fabio Estevam <fabio.estevam@nxp.com> | |
21 | Cc: Shawn Guo <shawnguo@kernel.org> | |
22 | Cc: linux-arm-kernel@lists.infradead.org | |
23 | Cc: linux-kernel@vger.kernel.org | |
24 | Signed-off-by: Shawn Guo <shawnguo@kernel.org> | |
25 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
26 | --- | |
27 | arch/arm/boot/dts/imx7s.dtsi | 4 ++-- | |
28 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
29 | ||
30 | diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi | |
31 | index a052198f6e96..a7f697b0290f 100644 | |
32 | --- a/arch/arm/boot/dts/imx7s.dtsi | |
33 | +++ b/arch/arm/boot/dts/imx7s.dtsi | |
34 | @@ -1050,8 +1050,8 @@ | |
35 | compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma"; | |
36 | reg = <0x30bd0000 0x10000>; | |
37 | interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; | |
38 | - clocks = <&clks IMX7D_SDMA_CORE_CLK>, | |
39 | - <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>; | |
40 | + clocks = <&clks IMX7D_IPG_ROOT_CLK>, | |
41 | + <&clks IMX7D_SDMA_CORE_CLK>; | |
42 | clock-names = "ipg", "ahb"; | |
43 | #dma-cells = <3>; | |
44 | fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin"; | |
45 | -- | |
46 | 2.20.1 | |
47 |