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

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