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

Commit 584cabc6 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to SDMA 



[ Upstream commit 8979117765c19edc3b01cc0ef853537bf93eea4b ]

Since 25aaa75df1e6 SDMA driver uses clock rates of "ipg" and "ahb"
clock to determine if it needs to configure the IP block as operating
at 1:1 or 1:2 clock ratio (ACR bit in SDMAARM_CONFIG). Specifying both
clocks as IMX6SX_CLK_SDMA results in driver incorrectly thinking that
ratio is 1:1 which results in broken SDMA funtionality. Fix the code
to specify IMX6SX_CLK_IPG as "ipg" clock for SDMA, to avoid detecting
incorrect clock ratio.

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Angus Ainslie (Purism) <angus@akkea.ca>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 02936545

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ 
				compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";

				reg = <0x020ec000 0x4000>;

				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SX_CLK_SDMA>,

				clocks = <&clks IMX6SX_CLK_IPG>,

					 <&clks IMX6SX_CLK_SDMA>;

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

				#dma-cells = <3>;