drop queue-5.6/revert-amba-initialize-dma_parms-for-amba-devices.patch

diff --git a/queue-5.6/revert-amba-initialize-dma_parms-for-amba-devices.patch b/queue-5.6/revert-amba-initialize-dma_parms-for-amba-devices.patch
deleted file mode 100644 (file)
index 552fdde..0000000
--- a/queue-5.6/revert-amba-initialize-dma_parms-for-amba-devices.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 97995883439df70966bc1a02c32dd1abee231ab5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 1 Apr 2020 08:03:28 +0200
-Subject: Revert "amba: Initialize dma_parms for amba devices"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-[ Upstream commit a9d68cbd4f8834d126ebdd3097a1dee1c5973fdf ]
-
-This reverts commit 5caf6102e32ead7ed5d21b5309c1a4a7d70e6a9f.  It still
-needs some more work and that will happen for the next release cycle,
-not this one.
-
-Cc: <stable@vger.kernel.org>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Ludovic Barre <ludovic.barre@st.com>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/amba/bus.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
-index 0bbfd647f5c6..26f0ecf401ea 100644
---- a/include/linux/amba/bus.h
-+++ b/include/linux/amba/bus.h
-@@ -65,7 +65,6 @@ struct amba_device {
-       struct device           dev;
-       struct resource         res;
-       struct clk              *pclk;
--      struct device_dma_parameters dma_parms;
-       unsigned int            periphid;
-       unsigned int            cid;
-       struct amba_cs_uci_id   uci;
--- 
-2.25.1
-

diff --git a/queue-5.6/series b/queue-5.6/series
index e46f8eb769cdf13b322f3237e2da21b8d86cfd35..c6cd57006390273ae71bb09967ecfd9906ed6de6 100644 (file)
--- a/queue-5.6/series
+++ b/queue-5.6/series
@@ -84,7 +84,6 @@ drm-i915-gvt-init-dpll-ddi-vreg-for-virtual-display-instead-of-inheritance.patch
 drm-i915-propagate-error-from-completed-fences.patch
 revert-gfs2-don-t-demote-a-glock-until-its-revokes-a.patch
 virtio-balloon-revert-virtio-balloon-switch-back-to-.patch
-revert-amba-initialize-dma_parms-for-amba-devices.patch
 revert-driver-core-platform-initialize-dma_parms-for.patch
 tools-bootconfig-fix-apply_xbc-to-return-zero-on-suc.patch
 kbuild-remove-debug-info-from-kallsyms-linking.patch