From 12e69eb63c3de45bd84932e5756889fb82aacc57 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Jul 2018 20:22:37 +0200 Subject: [PATCH] 4.17-stable patches added patches: arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch --- ...se-correct-sdma-script-for-spi5-core.patch | 41 +++++++++++++++++++ queue-4.17/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-4.17/arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch diff --git a/queue-4.17/arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch b/queue-4.17/arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch new file mode 100644 index 00000000000..951096f511d --- /dev/null +++ b/queue-4.17/arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch @@ -0,0 +1,41 @@ +From df07101e1c4a29e820df02f9989a066988b160e6 Mon Sep 17 00:00:00 2001 +From: Sean Nyekjaer +Date: Tue, 22 May 2018 19:45:09 +0200 +Subject: ARM: dts: imx6q: Use correct SDMA script for SPI5 core + +From: Sean Nyekjaer + +commit df07101e1c4a29e820df02f9989a066988b160e6 upstream. + +According to the reference manual the shp_2_mcu / mcu_2_shp +scripts must be used for devices connected through the SPBA. + +This fixes an issue we saw with DMA transfers. +Sometimes the SPI controller RX FIFO was not empty after a DMA +transfer and the driver got stuck in the next PIO transfer when +it read one word more than expected. + +commit dd4b487b32a35 ("ARM: dts: imx6: Use correct SDMA script +for SPI cores") is fixing the same issue but only for SPI1 - 4. + +Fixes: 677940258dd8e ("ARM: dts: imx6q: enable dma for ecspi5") +Signed-off-by: Sean Nyekjaer +Reviewed-by: Fabio Estevam +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/imx6q.dtsi ++++ b/arch/arm/boot/dts/imx6q.dtsi +@@ -96,7 +96,7 @@ + clocks = <&clks IMX6Q_CLK_ECSPI5>, + <&clks IMX6Q_CLK_ECSPI5>; + clock-names = "ipg", "per"; +- dmas = <&sdma 11 7 1>, <&sdma 12 7 2>; ++ dmas = <&sdma 11 8 1>, <&sdma 12 8 2>; + dma-names = "rx", "tx"; + status = "disabled"; + }; diff --git a/queue-4.17/series b/queue-4.17/series index 502ecdf5e10..8f84ef9e3d1 100644 --- a/queue-4.17/series +++ b/queue-4.17/series @@ -43,3 +43,4 @@ netfilter-xt_connmark-fix-list-corruption-on-rmmod.patch netfilter-nf_tables-use-warn_on_once-instead-of-bug_on-in-nft_do_chain.patch arm64-dts-meson-gxl-s905x-p212-add-phy-supply-for-usb0.patch x86-mm-don-t-free-p4d-table-when-it-is-folded-at-runtime.patch +arm-dts-imx6q-use-correct-sdma-script-for-spi5-core.patch -- 2.47.3