delete spi-rockchip-modify-dma-max-burst-to-1.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index aa0169fc4ac55dee9447d00daeaf185693f7b009..4da6cc7347d861cf11ea4ad001354070c7ab0a94 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -133,7 +133,6 @@ rtc-rx8025-remove-rv8803-id.patch
 rtc-max77686-properly-handle-regmap_irq_get_virq-error-code.patch
 drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch
 perf-evlist-reference-count-the-cpu-and-thread-maps-at-set_maps.patch
-spi-rockchip-modify-dma-max-burst-to-1.patch
 x86-mm-kmmio-fix-mmiotrace-for-hugepages.patch
 ext4-fix-null-pointer-dereference-in-ext4_mark_inode_dirty.patch
 serial-sh-sci-remove-cpufreq-notifier-to-fix-crash-deadlock.patch

diff --git a/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch b/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch
deleted file mode 100644 (file)
index fbc2b04..0000000
--- a/queue-4.4/spi-rockchip-modify-dma-max-burst-to-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 80abf8880cc6e1594c11b7c417f22dde60e25312 Mon Sep 17 00:00:00 2001
-From: Addy Ke <addy.ke@rock-chips.com>
-Date: Fri, 22 Jan 2016 19:06:52 +0800
-Subject: spi: rockchip: modify DMA max burst to 1
-
-From: Addy Ke <addy.ke@rock-chips.com>
-
-commit 80abf8880cc6e1594c11b7c417f22dde60e25312 upstream.
-
-Generic dma controller on Rockchips' platform cannot support
-DMAFLUSHP instruction which make dma to flush the req of non-aligned
-or non-multiple of what we need. That will cause an unrecoverable
-dma bus error. The saftest way is to set dma max burst to 1.
-
-Signed-off-by: Addy ke <addy.ke@rock-chips.com>
-Fixes: 64e36824b32b06 ("spi/rockchip: add driver for Rockchip...")
-Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
-cc: Heiko Stuebner <heiko@sntech.de>
-cc: Olof Johansson <olof@lixom.net>
-cc: Doug Anderson <dianders@chromium.org>
-cc: Sonny Rao <sonnyrao@chromium.org>
-Acked-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Caesar Wang <wxt@rock-chips.com>
-Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-rockchip.c |   12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
---- a/drivers/spi/spi-rockchip.c
-+++ b/drivers/spi/spi-rockchip.c
-@@ -199,6 +199,7 @@ struct rockchip_spi {
-       struct sg_table rx_sg;
-       struct rockchip_spi_dma_data dma_rx;
-       struct rockchip_spi_dma_data dma_tx;
-+      struct dma_slave_caps dma_caps;
- };
- 
- static inline void spi_enable_chip(struct rockchip_spi *rs, int enable)
-@@ -454,7 +455,10 @@ static void rockchip_spi_prepare_dma(str
-               rxconf.direction = rs->dma_rx.direction;
-               rxconf.src_addr = rs->dma_rx.addr;
-               rxconf.src_addr_width = rs->n_bytes;
--              rxconf.src_maxburst = rs->n_bytes;
-+              if (rs->dma_caps.max_burst > 4)
-+                      rxconf.src_maxburst = 4;
-+              else
-+                      rxconf.src_maxburst = 1;
-               dmaengine_slave_config(rs->dma_rx.ch, &rxconf);
- 
-               rxdesc = dmaengine_prep_slave_sg(
-@@ -471,7 +475,10 @@ static void rockchip_spi_prepare_dma(str
-               txconf.direction = rs->dma_tx.direction;
-               txconf.dst_addr = rs->dma_tx.addr;
-               txconf.dst_addr_width = rs->n_bytes;
--              txconf.dst_maxburst = rs->n_bytes;
-+              if (rs->dma_caps.max_burst > 4)
-+                      txconf.dst_maxburst = 4;
-+              else
-+                      txconf.dst_maxburst = 1;
-               dmaengine_slave_config(rs->dma_tx.ch, &txconf);
- 
-               txdesc = dmaengine_prep_slave_sg(
-@@ -735,6 +742,7 @@ static int rockchip_spi_probe(struct pla
-       }
- 
-       if (rs->dma_tx.ch && rs->dma_rx.ch) {
-+              dma_get_slave_caps(rs->dma_rx.ch, &(rs->dma_caps));
-               rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
-               rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
-               rs->dma_tx.direction = DMA_MEM_TO_DEV;

diff --git a/queue-4.5/series b/queue-4.5/series
index ae066950507bd2211363a249d335260210f98034..7734c4028e6d33d9dc30c171f73346e2b21270ff 100644 (file)
--- a/queue-4.5/series
+++ b/queue-4.5/series
@@ -156,7 +156,6 @@ rtc-max77686-properly-handle-regmap_irq_get_virq-error-code.patch
 drivers-misc-ad525x_dpot-ad5274-fix-rdac-read-back-errors.patch
 perf-evlist-reference-count-the-cpu-and-thread-maps-at-set_maps.patch
 perf-tools-fix-perf-script-python-database-export-crash.patch
-spi-rockchip-modify-dma-max-burst-to-1.patch
 x86-mm-kmmio-fix-mmiotrace-for-hugepages.patch
 ext4-fix-null-pointer-dereference-in-ext4_mark_inode_dirty.patch
 f2fs-crypto-fix-corrupted-symlink-in-encrypted-case.patch

diff --git a/queue-4.5/spi-rockchip-modify-dma-max-burst-to-1.patch b/queue-4.5/spi-rockchip-modify-dma-max-burst-to-1.patch
deleted file mode 100644 (file)
index fbc2b04..0000000
--- a/queue-4.5/spi-rockchip-modify-dma-max-burst-to-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 80abf8880cc6e1594c11b7c417f22dde60e25312 Mon Sep 17 00:00:00 2001
-From: Addy Ke <addy.ke@rock-chips.com>
-Date: Fri, 22 Jan 2016 19:06:52 +0800
-Subject: spi: rockchip: modify DMA max burst to 1
-
-From: Addy Ke <addy.ke@rock-chips.com>
-
-commit 80abf8880cc6e1594c11b7c417f22dde60e25312 upstream.
-
-Generic dma controller on Rockchips' platform cannot support
-DMAFLUSHP instruction which make dma to flush the req of non-aligned
-or non-multiple of what we need. That will cause an unrecoverable
-dma bus error. The saftest way is to set dma max burst to 1.
-
-Signed-off-by: Addy ke <addy.ke@rock-chips.com>
-Fixes: 64e36824b32b06 ("spi/rockchip: add driver for Rockchip...")
-Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
-cc: Heiko Stuebner <heiko@sntech.de>
-cc: Olof Johansson <olof@lixom.net>
-cc: Doug Anderson <dianders@chromium.org>
-cc: Sonny Rao <sonnyrao@chromium.org>
-Acked-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Caesar Wang <wxt@rock-chips.com>
-Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-rockchip.c |   12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
---- a/drivers/spi/spi-rockchip.c
-+++ b/drivers/spi/spi-rockchip.c
-@@ -199,6 +199,7 @@ struct rockchip_spi {
-       struct sg_table rx_sg;
-       struct rockchip_spi_dma_data dma_rx;
-       struct rockchip_spi_dma_data dma_tx;
-+      struct dma_slave_caps dma_caps;
- };
- 
- static inline void spi_enable_chip(struct rockchip_spi *rs, int enable)
-@@ -454,7 +455,10 @@ static void rockchip_spi_prepare_dma(str
-               rxconf.direction = rs->dma_rx.direction;
-               rxconf.src_addr = rs->dma_rx.addr;
-               rxconf.src_addr_width = rs->n_bytes;
--              rxconf.src_maxburst = rs->n_bytes;
-+              if (rs->dma_caps.max_burst > 4)
-+                      rxconf.src_maxburst = 4;
-+              else
-+                      rxconf.src_maxburst = 1;
-               dmaengine_slave_config(rs->dma_rx.ch, &rxconf);
- 
-               rxdesc = dmaengine_prep_slave_sg(
-@@ -471,7 +475,10 @@ static void rockchip_spi_prepare_dma(str
-               txconf.direction = rs->dma_tx.direction;
-               txconf.dst_addr = rs->dma_tx.addr;
-               txconf.dst_addr_width = rs->n_bytes;
--              txconf.dst_maxburst = rs->n_bytes;
-+              if (rs->dma_caps.max_burst > 4)
-+                      txconf.dst_maxburst = 4;
-+              else
-+                      txconf.dst_maxburst = 1;
-               dmaengine_slave_config(rs->dma_tx.ch, &txconf);
- 
-               txdesc = dmaengine_prep_slave_sg(
-@@ -735,6 +742,7 @@ static int rockchip_spi_probe(struct pla
-       }
- 
-       if (rs->dma_tx.ch && rs->dma_rx.ch) {
-+              dma_get_slave_caps(rs->dma_rx.ch, &(rs->dma_caps));
-               rs->dma_tx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_TXDR);
-               rs->dma_rx.addr = (dma_addr_t)(mem->start + ROCKCHIP_SPI_RXDR);
-               rs->dma_tx.direction = DMA_MEM_TO_DEV;