Drop sunxi patches from 4.9

diff --git a/queue-4.9/drivers-soc-sunxi-add-support-for-a64-and-its-sram-c.patch b/queue-4.9/drivers-soc-sunxi-add-support-for-a64-and-its-sram-c.patch
deleted file mode 100644 (file)
index 1d065fc..0000000
--- a/queue-4.9/drivers-soc-sunxi-add-support-for-a64-and-its-sram-c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 489fd2a71c96a81da489abf3f099b1e9417496ca Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Aug 2017 16:56:27 +0800
-Subject: drivers: soc: sunxi: add support for A64 and its SRAM C
-
-From: Icenowy Zheng <icenowy@aosc.io>
-
-[ Upstream commit 5e4fb6429761ebe8f5acb5a761fa57d02a91ac6f ]
-
-Allwinner A64's display engine claims the SRAM C section to work.
-
-Add support for the A64 SRAM controller and the SRAM C section of it.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Chen-Yu Tsai <wens@csie.org>
-Stable-dep-of: 49fad91a7b89 ("soc: sunxi: sram: Fix probe function ordering issues")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/sunxi/sunxi_sram.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
-index 706ed0cb568b..45bafaae15fc 100644
---- a/drivers/soc/sunxi/sunxi_sram.c
-+++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -67,6 +67,12 @@ static struct sunxi_sram_desc sun4i_a10_sram_d = {
-                                 SUNXI_SRAM_MAP(1, "usb-otg")),
- };
- 
-+static struct sunxi_sram_desc sun50i_a64_sram_c = {
-+      .data   = SUNXI_SRAM_DATA("C", 0x4, 24, 1,
-+                                SUNXI_SRAM_MAP(0, 1, "cpu"),
-+                                SUNXI_SRAM_MAP(1, 0, "de2")),
-+};
-+
- static const struct of_device_id sunxi_sram_dt_ids[] = {
-       {
-               .compatible     = "allwinner,sun4i-a10-sram-a3-a4",
-@@ -76,6 +82,10 @@ static const struct of_device_id sunxi_sram_dt_ids[] = {
-               .compatible     = "allwinner,sun4i-a10-sram-d",
-               .data           = &sun4i_a10_sram_d.data,
-       },
-+      {
-+              .compatible     = "allwinner,sun50i-a64-sram-c",
-+              .data           = &sun50i_a64_sram_c.data,
-+      },
-       {}
- };
- 
-@@ -268,6 +278,7 @@ static int sunxi_sram_probe(struct platform_device *pdev)
- 
- static const struct of_device_id sunxi_sram_dt_match[] = {
-       { .compatible = "allwinner,sun4i-a10-sram-controller" },
-+      { .compatible = "allwinner,sun50i-a64-sram-controller" },
-       { },
- };
- MODULE_DEVICE_TABLE(of, sunxi_sram_dt_match);
--- 
-2.35.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 195c86c860ccedf6cdf83edd5a69b2f89ac2e48c..db565db31136c8f536164e89c2dae8aa44f19a84 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -5,9 +5,6 @@ net-usb-qmi_wwan-add-new-usb-id-for-dell-branded-em7455.patch
 ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch
 mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch
 mm-prevent-page_frag_alloc-from-corrupting-the-memory.patch
-soc-sunxi-sram-actually-claim-sram-regions.patch
-drivers-soc-sunxi-add-support-for-a64-and-its-sram-c.patch
-soc-sunxi-sram-fix-debugfs-info-for-a64-sram-c.patch
 revert-drm-bridge-analogix-dp-add-panel-prepare-unpr.patch
 input-melfas_mip4-fix-return-value-check-in-mip4_pro.patch
 usbnet-fix-memory-leak-in-usbnet_disconnect.patch

diff --git a/queue-4.9/soc-sunxi-sram-actually-claim-sram-regions.patch b/queue-4.9/soc-sunxi-sram-actually-claim-sram-regions.patch
deleted file mode 100644 (file)
index c38aee1..0000000
--- a/queue-4.9/soc-sunxi-sram-actually-claim-sram-regions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8bcafdc1f9e0ba37333b6571a169315e6ea28fd0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 14 Aug 2022 23:12:40 -0500
-Subject: soc: sunxi: sram: Actually claim SRAM regions
-
-From: Samuel Holland <samuel@sholland.org>
-
-[ Upstream commit fd362baad2e659ef0fb5652f023a606b248f1781 ]
-
-sunxi_sram_claim() checks the sram_desc->claimed flag before updating
-the register, with the intent that only one device can claim a region.
-However, this was ineffective because the flag was never set.
-
-Fixes: 4af34b572a85 ("drivers: soc: sunxi: Introduce SoC driver to map SRAMs")
-Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Reviewed-by: Heiko Stuebner <heiko@sntech.de>
-Tested-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-Link: https://lore.kernel.org/r/20220815041248.53268-4-samuel@sholland.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/sunxi/sunxi_sram.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
-index 99e354c8f53f..706ed0cb568b 100644
---- a/drivers/soc/sunxi/sunxi_sram.c
-+++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -215,6 +215,7 @@ int sunxi_sram_claim(struct device *dev)
-       writel(val | ((device << sram_data->offset) & mask),
-              base + sram_data->reg);
- 
-+      sram_desc->claimed = true;
-       spin_unlock(&sram_lock);
- 
-       return 0;
--- 
-2.35.1
-

diff --git a/queue-4.9/soc-sunxi-sram-fix-debugfs-info-for-a64-sram-c.patch b/queue-4.9/soc-sunxi-sram-fix-debugfs-info-for-a64-sram-c.patch
deleted file mode 100644 (file)
index de4612e..0000000
--- a/queue-4.9/soc-sunxi-sram-fix-debugfs-info-for-a64-sram-c.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fcbae40b289ac3930411ddf895e1bee91842c7cc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 14 Aug 2022 23:12:43 -0500
-Subject: soc: sunxi: sram: Fix debugfs info for A64 SRAM C
-
-From: Samuel Holland <samuel@sholland.org>
-
-[ Upstream commit e3c95edb1bd8b9c2cb0caa6ae382fc8080f6a0ed ]
-
-The labels were backward with respect to the register values. The SRAM
-is mapped to the CPU when the register value is 1.
-
-Fixes: 5e4fb6429761 ("drivers: soc: sunxi: add support for A64 and its SRAM C")
-Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-Signed-off-by: Samuel Holland <samuel@sholland.org>
-Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-Link: https://lore.kernel.org/r/20220815041248.53268-7-samuel@sholland.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/soc/sunxi/sunxi_sram.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c
-index 45bafaae15fc..49c028653842 100644
---- a/drivers/soc/sunxi/sunxi_sram.c
-+++ b/drivers/soc/sunxi/sunxi_sram.c
-@@ -69,8 +69,8 @@ static struct sunxi_sram_desc sun4i_a10_sram_d = {
- 
- static struct sunxi_sram_desc sun50i_a64_sram_c = {
-       .data   = SUNXI_SRAM_DATA("C", 0x4, 24, 1,
--                                SUNXI_SRAM_MAP(0, 1, "cpu"),
--                                SUNXI_SRAM_MAP(1, 0, "de2")),
-+                                SUNXI_SRAM_MAP(1, 0, "cpu"),
-+                                SUNXI_SRAM_MAP(0, 1, "de2")),
- };
- 
- static const struct of_device_id sunxi_sram_dt_ids[] = {
--- 
-2.35.1
-