queue-4.19/arm-dts-imx6sx-specify-imx6sx_clk_ipg-as-ipg-clock-t.patch

   1 From 734f857bdeaba2ac58d21e92c0494d5c511127f4 Mon Sep 17 00:00:00 2001
   2 From: Andrey Smirnov <andrew.smirnov@gmail.com>
   3 Date: Thu, 28 Mar 2019 23:49:17 -0700
   4 Subject: ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to SDMA
   5
   6 [ Upstream commit 8979117765c19edc3b01cc0ef853537bf93eea4b ]
   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 IMX6SX_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 IMX6SX_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/imx6sx.dtsi | 2 +-
  28  1 file changed, 1 insertion(+), 1 deletion(-)
  29
  30 diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
  31 index 50083cecc6c9..7b62e6fb47eb 100644
  32 --- a/arch/arm/boot/dts/imx6sx.dtsi
  33 +++ b/arch/arm/boot/dts/imx6sx.dtsi
  34 @@ -803,7 +803,7 @@
  35                                 compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
  36                                 reg = <0x020ec000 0x4000>;
  37                                 interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
  38 -                               clocks = <&clks IMX6SX_CLK_SDMA>,
  39 +                               clocks = <&clks IMX6SX_CLK_IPG>,
  40                                          <&clks IMX6SX_CLK_SDMA>;
  41                                 clock-names = "ipg", "ahb";
  42                                 #dma-cells = <3>;
  43 --
  44 2.20.1
  45