jh71x0: update patches and config
[openwrt/staging/wigyori.git] / target / linux / jh71x0 / patches-6.1 / 0109-dmaengine-dw-axi-dmac-Increase-polling-time-to-DMA-t.patch
diff --git a/target/linux/jh71x0/patches-6.1/0109-dmaengine-dw-axi-dmac-Increase-polling-time-to-DMA-t.patch b/target/linux/jh71x0/patches-6.1/0109-dmaengine-dw-axi-dmac-Increase-polling-time-to-DMA-t.patch
deleted file mode 100644 (file)
index 6e045cb..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From bdb353f3e23ff1d541178791ae06c0ef1fa45e53 Mon Sep 17 00:00:00 2001
-From: Walker Chen <walker.chen@starfivetech.com>
-Date: Wed, 22 Mar 2023 17:48:19 +0800
-Subject: [PATCH 109/111] dmaengine: dw-axi-dmac: Increase polling time to DMA
- transmission completion status
-
-The bit DMAC_CHEN[0] is automatically cleared by hardware to disable the
-channel after the last AMBA transfer of the DMA transfer to the
-destination has completed. Software can therefore poll this bit to
-determine when this channel is free for a new DMA transfer.
-This time requires at least 40 milliseconds on JH7110 SoC, otherwise an
-error message 'failed to stop' will be reported.
-
-Signed-off-by: Walker Chen <walker.chen@starfivetech.com>
----
- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-index 6cfcb541d8c3..6937cc0c0b65 100644
---- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-@@ -1147,7 +1147,7 @@ static int dma_chan_terminate_all(struct dma_chan *dchan)
-       axi_chan_disable(chan);
-       ret = readl_poll_timeout_atomic(chan->chip->regs + DMAC_CHEN, val,
--                                      !(val & chan_active), 1000, 10000);
-+                                      !(val & chan_active), 1000, 50000);
-       if (ret == -ETIMEDOUT)
-               dev_warn(dchan2dev(dchan),
-                        "%s failed to stop\n", axi_chan_name(chan));
--- 
-2.20.1
-