projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 37554d48 SL |
1 | From ba51f329a3b709b405bf7fb4c9b49ad200e862bb Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrey Smirnov <andrew.smirnov@gmail.com> | |
| 3 | Date: Thu, 28 Mar 2019 23:49:23 -0700 | |
| 4 | Subject: ARM: dts: imx51: Specify IMX5_CLK_IPG as "ahb" clock to SDMA | |
| 5 | ||
| 6 | [ Upstream commit 918bbde8085ae147a43dcb491953e0dd8f3e9d6a ] | |
| 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 IMX5_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 IMX5_CLK_AHB as "ahb" 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/imx51.dtsi | 2 +- | |
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 29 | ||
| 30 | diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi | |
| 31 | index 5c4ba91e43ba..ef2abc097843 100644 | |
| 32 | --- a/arch/arm/boot/dts/imx51.dtsi | |
| 33 | +++ b/arch/arm/boot/dts/imx51.dtsi | |
| 34 | @@ -481,7 +481,7 @@ | |
| 35 | reg = <0x83fb0000 0x4000>; | |
| 36 | interrupts = <6>; | |
| 37 | clocks = <&clks IMX5_CLK_SDMA_GATE>, | |
| 38 | - <&clks IMX5_CLK_SDMA_GATE>; | |
| 39 | + <&clks IMX5_CLK_AHB>; | |
| 40 | clock-names = "ipg", "ahb"; | |
| 41 | #dma-cells = <3>; | |
| 42 | fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin"; | |
| 43 | -- | |
| 44 | 2.20.1 | |
| 45 |