drop broken 4.14 patches

diff --git a/queue-4.14/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch b/queue-4.14/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch
deleted file mode 100644 (file)
index 4bc4c87..0000000
--- a/queue-4.14/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e449a06088839de5982c39772720aa61910f5a7b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 29 Sep 2018 11:18:00 -0600
-Subject: dmaengine: xilinx_dma: Fix 64-bit simple CDMA transfer
-
-From: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
-
-[ Upstream commit 0e03aca2659ef7a85eaff1a1ca9b0b498002ede8 ]
-
-In AXI CDMA simple mode also pass MSB bits of source and destination
-address to xilinx_write function. This fixes simple CDMA operation
-mode using 64-bit addressing.
-
-Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
-Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-Reviewed-by: Appana Durga Kedareswara Rao <appana.durga.rao@xilinx.com>
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/dma/xilinx/xilinx_dma.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
-index 2db352308e5c0..c5d22c5d12a06 100644
---- a/drivers/dma/xilinx/xilinx_dma.c
-+++ b/drivers/dma/xilinx/xilinx_dma.c
-@@ -1182,8 +1182,10 @@ static void xilinx_cdma_start_transfer(struct xilinx_dma_chan *chan)
- 
-               hw = &segment->hw;
- 
--              xilinx_write(chan, XILINX_CDMA_REG_SRCADDR, hw->src_addr);
--              xilinx_write(chan, XILINX_CDMA_REG_DSTADDR, hw->dest_addr);
-+              xilinx_write(chan, XILINX_CDMA_REG_SRCADDR,
-+                           xilinx_prep_dma_addr_t(hw->src_addr));
-+              xilinx_write(chan, XILINX_CDMA_REG_DSTADDR,
-+                           xilinx_prep_dma_addr_t(hw->dest_addr));
- 
-               /* Start the transfer */
-               dma_ctrl_write(chan, XILINX_DMA_REG_BTT,
--- 
-2.20.1
-

diff --git a/queue-4.14/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch b/queue-4.14/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch
deleted file mode 100644 (file)
index 0ccb2c0..0000000
--- a/queue-4.14/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 10a7167c6301ea85fe0f61672ada0a42fc829da0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 8 Nov 2018 17:07:25 +0100
-Subject: pinctrl: sh-pfc: r8a7792: Fix VIN versioned groups
-
-From: Jacopo Mondi <jacopo+renesas@jmondi.org>
-
-[ Upstream commit 11c8f8df85e77329d5a3cacc08682722cb80b95b ]
-
-Versioned VIN groups can appear on different sets of pins. Using the
-VIN_DATA_PIN_GROUP macro now supports proper naming of said groups
-through an optional 'version' argument.
-
-Use the 'version' argument for said macro to fix naming of versioned
-groups for the R-Car V2H R8A7792 SoC.
-
-Fixes: 7dd74bb1f058 ("pinctrl: sh-pfc: r8a7792: Add VIN pin groups")
-Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
-Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c
-index cc3597f66605a..b3814ca009b02 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c
-@@ -1747,10 +1747,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
-       VIN_DATA_PIN_GROUP(vin1_data, 12),
-       VIN_DATA_PIN_GROUP(vin1_data, 10),
-       VIN_DATA_PIN_GROUP(vin1_data, 8),
--      VIN_DATA_PIN_GROUP(vin1_data_b, 24),
--      VIN_DATA_PIN_GROUP(vin1_data_b, 20),
-+      VIN_DATA_PIN_GROUP(vin1_data, 24, _b),
-+      VIN_DATA_PIN_GROUP(vin1_data, 20, _b),
-       SH_PFC_PIN_GROUP(vin1_data18_b),
--      VIN_DATA_PIN_GROUP(vin1_data_b, 16),
-+      VIN_DATA_PIN_GROUP(vin1_data, 16, _b),
-       SH_PFC_PIN_GROUP(vin1_sync),
-       SH_PFC_PIN_GROUP(vin1_field),
-       SH_PFC_PIN_GROUP(vin1_clkenb),
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 3603378a40928ddbe35aab1e3dbc62ef75fa8171..1624cf67208c996faa4d2f5458c0b67a09a20ac4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -23,10 +23,8 @@ serial-core-allow-processing-sysrq-at-port-unlock-ti.patch
 cxgb4vf-fix-memleak-in-mac_hlist-initialization.patch
 iwlwifi-mvm-synchronize-tid-queue-removal.patch
 iwlwifi-mvm-send-non-offchannel-traffic-via-ap-sta.patch
-dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch
 arm-8813-1-make-aligned-2-byte-getuser-putuser-atomi.patch
 net-mlx5-release-resource-on-error-flow.patch
-pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch
 clk-sunxi-ng-a64-fix-gate-bit-of-dsi-dphy.patch
 dlm-fix-possible-call-to-kfree-for-non-initialized-p.patch
 extcon-max8997-fix-lack-of-path-setting-in-usb-devic.patch