From: Sasha Levin Date: Thu, 16 Sep 2021 13:56:20 +0000 (-0400) Subject: Drop spi-imx-fix-err009165.patch X-Git-Tag: v5.10.67~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8070f5d77bb3eab36a606d14369d2a02b5190c5b;p=thirdparty%2Fkernel%2Fstable-queue.git Drop spi-imx-fix-err009165.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.10/series b/queue-5.10/series index 226dd7ffb06..30057d3e0ff 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -144,7 +144,6 @@ media-platform-stm32-unprepare-clocks-at-handling-er.patch media-atomisp-fix-runtime-pm-imbalance-in-atomisp_pc.patch media-atomisp-pci-fix-error-return-code-in-atomisp_p.patch nfp-fix-return-statement-in-nfp_net_parse_meta.patch -spi-imx-fix-err009165.patch ethtool-improve-compat-ioctl-handling.patch drm-amdgpu-fix-a-printing-message.patch drm-amd-amdgpu-update-debugfs-link_settings-output-l.patch diff --git a/queue-5.10/spi-imx-fix-err009165.patch b/queue-5.10/spi-imx-fix-err009165.patch deleted file mode 100644 index c635f952c4f..00000000000 --- a/queue-5.10/spi-imx-fix-err009165.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 75db367d73048777efac2e0f5c58262da9987e30 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Jul 2021 18:20:47 +0800 -Subject: spi: imx: fix ERR009165 - -From: Robin Gong - -[ Upstream commit 980f884866eed4dda2a18de888c5a67dde67d640 ] - -Change to XCH mode even in dma mode, please refer to the below -errata: -https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf - -Signed-off-by: Robin Gong -Reviewed-by: Lucas Stach -Acked-by: Mark Brown -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-imx.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c -index 0e3bc0b0a526..2652130eda6a 100644 ---- a/drivers/spi/spi-imx.c -+++ b/drivers/spi/spi-imx.c -@@ -622,8 +622,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, - ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk); - spi_imx->spi_bus_clk = clk; - -- if (spi_imx->usedma) -- ctrl |= MX51_ECSPI_CTRL_SMC; -+ /* ERR009165: work in XHC mode as PIO */ -+ ctrl &= ~MX51_ECSPI_CTRL_SMC; - - writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); - -@@ -637,7 +637,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) - * and enable DMA request. - */ - writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) | -- MX51_ECSPI_DMA_TX_WML(spi_imx->wml) | -+ MX51_ECSPI_DMA_TX_WML(0) | - MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) | - MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN | - MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA); -@@ -1280,10 +1280,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, - { - int ret; - -- /* use pio mode for i.mx6dl chip TKT238285 */ -- if (of_machine_is_compatible("fsl,imx6dl")) -- return 0; -- - spi_imx->wml = spi_imx->devtype_data->fifo_size / 2; - - /* Prepare for TX DMA: */ --- -2.30.2 - diff --git a/queue-5.13/series b/queue-5.13/series index 6221c25f2ac..8716bee6dd6 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -185,7 +185,6 @@ media-platform-stm32-unprepare-clocks-at-handling-er.patch media-atomisp-fix-runtime-pm-imbalance-in-atomisp_pc.patch media-atomisp-pci-fix-error-return-code-in-atomisp_p.patch nfp-fix-return-statement-in-nfp_net_parse_meta.patch -spi-imx-fix-err009165.patch spi-imx-remove-err009165-workaround-on-i.mx6ul.patch ethtool-improve-compat-ioctl-handling.patch drm-amdgpu-fix-a-printing-message.patch diff --git a/queue-5.13/spi-imx-fix-err009165.patch b/queue-5.13/spi-imx-fix-err009165.patch deleted file mode 100644 index 316d5099e30..00000000000 --- a/queue-5.13/spi-imx-fix-err009165.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c3a280a944ffa34c974aec20b3ff3ec801bc8bbc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Jul 2021 18:20:47 +0800 -Subject: spi: imx: fix ERR009165 - -From: Robin Gong - -[ Upstream commit 980f884866eed4dda2a18de888c5a67dde67d640 ] - -Change to XCH mode even in dma mode, please refer to the below -errata: -https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf - -Signed-off-by: Robin Gong -Reviewed-by: Lucas Stach -Acked-by: Mark Brown -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-imx.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c -index 2872993550bd..ac86b3d1052d 100644 ---- a/drivers/spi/spi-imx.c -+++ b/drivers/spi/spi-imx.c -@@ -622,8 +622,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, - ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk); - spi_imx->spi_bus_clk = clk; - -- if (spi_imx->usedma) -- ctrl |= MX51_ECSPI_CTRL_SMC; -+ /* ERR009165: work in XHC mode as PIO */ -+ ctrl &= ~MX51_ECSPI_CTRL_SMC; - - writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); - -@@ -637,7 +637,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) - * and enable DMA request. - */ - writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) | -- MX51_ECSPI_DMA_TX_WML(spi_imx->wml) | -+ MX51_ECSPI_DMA_TX_WML(0) | - MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) | - MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN | - MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA); -@@ -1253,10 +1253,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, - { - int ret; - -- /* use pio mode for i.mx6dl chip TKT238285 */ -- if (of_machine_is_compatible("fsl,imx6dl")) -- return 0; -- - spi_imx->wml = spi_imx->devtype_data->fifo_size / 2; - - /* Prepare for TX DMA: */ --- -2.30.2 - diff --git a/queue-5.14/series b/queue-5.14/series index ba1a5865479..71d266729d9 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -209,7 +209,6 @@ media-platform-stm32-unprepare-clocks-at-handling-er.patch media-atomisp-fix-runtime-pm-imbalance-in-atomisp_pc.patch media-atomisp-pci-fix-error-return-code-in-atomisp_p.patch nfp-fix-return-statement-in-nfp_net_parse_meta.patch -spi-imx-fix-err009165.patch spi-imx-remove-err009165-workaround-on-i.mx6ul.patch ethtool-improve-compat-ioctl-handling.patch drm-amd-display-fixed-hardware-power-down-bypass-dur.patch diff --git a/queue-5.14/spi-imx-fix-err009165.patch b/queue-5.14/spi-imx-fix-err009165.patch deleted file mode 100644 index 4a70bc4953a..00000000000 --- a/queue-5.14/spi-imx-fix-err009165.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e69d0655765eb8d57db75369faff9e63dd44507b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Jul 2021 18:20:47 +0800 -Subject: spi: imx: fix ERR009165 - -From: Robin Gong - -[ Upstream commit 980f884866eed4dda2a18de888c5a67dde67d640 ] - -Change to XCH mode even in dma mode, please refer to the below -errata: -https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf - -Signed-off-by: Robin Gong -Reviewed-by: Lucas Stach -Acked-by: Mark Brown -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-imx.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c -index fa68e9817929..d89b11205815 100644 ---- a/drivers/spi/spi-imx.c -+++ b/drivers/spi/spi-imx.c -@@ -622,8 +622,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, - ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk); - spi_imx->spi_bus_clk = clk; - -- if (spi_imx->usedma) -- ctrl |= MX51_ECSPI_CTRL_SMC; -+ /* ERR009165: work in XHC mode as PIO */ -+ ctrl &= ~MX51_ECSPI_CTRL_SMC; - - writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); - -@@ -637,7 +637,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) - * and enable DMA request. - */ - writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) | -- MX51_ECSPI_DMA_TX_WML(spi_imx->wml) | -+ MX51_ECSPI_DMA_TX_WML(0) | - MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) | - MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN | - MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA); -@@ -1253,10 +1253,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, - { - int ret; - -- /* use pio mode for i.mx6dl chip TKT238285 */ -- if (of_machine_is_compatible("fsl,imx6dl")) -- return 0; -- - spi_imx->wml = spi_imx->devtype_data->fifo_size / 2; - - /* Prepare for TX DMA: */ --- -2.30.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 0d5aaa09991..eb3a085867f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -93,7 +93,6 @@ usb-gadget-composite-allow-bmaxpower-0-if-self-power.patch staging-board-fix-uninitialized-spinlock-when-attach.patch tty-serial-jsm-hold-port-lock-when-reporting-modem-l.patch drm-amd-display-fix-timer_per_pixel-unit-error.patch -spi-imx-fix-err009165.patch drm-amd-amdgpu-update-debugfs-link_settings-output-l.patch bpf-tests-fix-copy-and-paste-error-in-double-word-te.patch bpf-tests-do-not-pass-tests-without-actually-testing.patch diff --git a/queue-5.4/spi-imx-fix-err009165.patch b/queue-5.4/spi-imx-fix-err009165.patch deleted file mode 100644 index 9eb69e16f99..00000000000 --- a/queue-5.4/spi-imx-fix-err009165.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 706610f4bfeb2f11494d3628b0b2cb664e5b182f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Jul 2021 18:20:47 +0800 -Subject: spi: imx: fix ERR009165 - -From: Robin Gong - -[ Upstream commit 980f884866eed4dda2a18de888c5a67dde67d640 ] - -Change to XCH mode even in dma mode, please refer to the below -errata: -https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf - -Signed-off-by: Robin Gong -Reviewed-by: Lucas Stach -Acked-by: Mark Brown -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - drivers/spi/spi-imx.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c -index 474d5a7fa95e..c47e1d428ef4 100644 ---- a/drivers/spi/spi-imx.c -+++ b/drivers/spi/spi-imx.c -@@ -614,8 +614,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, - ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk); - spi_imx->spi_bus_clk = clk; - -- if (spi_imx->usedma) -- ctrl |= MX51_ECSPI_CTRL_SMC; -+ /* ERR009165: work in XHC mode as PIO */ -+ ctrl &= ~MX51_ECSPI_CTRL_SMC; - - writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); - -@@ -629,7 +629,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx) - * and enable DMA request. - */ - writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) | -- MX51_ECSPI_DMA_TX_WML(spi_imx->wml) | -+ MX51_ECSPI_DMA_TX_WML(0) | - MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) | - MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN | - MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA); -@@ -1284,10 +1284,6 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx, - { - int ret; - -- /* use pio mode for i.mx6dl chip TKT238285 */ -- if (of_machine_is_compatible("fsl,imx6dl")) -- return 0; -- - spi_imx->wml = spi_imx->devtype_data->fifo_size / 2; - - /* Prepare for TX DMA: */ --- -2.30.2 -