drop mips-restore-au1300-support.patch from 5.15, 5.10, and 5.4

diff --git a/queue-5.10/mips-restore-au1300-support.patch b/queue-5.10/mips-restore-au1300-support.patch
deleted file mode 100644 (file)
index 5a05385..0000000
--- a/queue-5.10/mips-restore-au1300-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b3a32f288e6eeb0dde653ad1a4f2057529b13b5a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 May 2023 12:33:23 +0200
-Subject: MIPS: Restore Au1300 support
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ]
-
-The Au1300, at least the one I have to test, uses the NetLogic vendor
-ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also
-dropped Au1300 detection.  Restore Au1300 detection.
-
-Tested on DB1300 with Au1380 chip.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/kernel/cpu-probe.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
-index d120201910acf..954ef0513c404 100644
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -1555,6 +1555,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
-                       break;
-               }
-               break;
-+      case PRID_IMP_NETLOGIC_AU13XX:
-+              c->cputype = CPU_ALCHEMY;
-+              __cpu_name[cpu] = "Au1300";
-+              break;
-       }
- }
- 
-@@ -1992,6 +1996,7 @@ void cpu_probe(void)
-               cpu_probe_mips(c, cpu);
-               break;
-       case PRID_COMP_ALCHEMY:
-+      case PRID_COMP_NETLOGIC:
-               cpu_probe_alchemy(c, cpu);
-               break;
-       case PRID_COMP_SIBYTE:
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 54ec332aabd0cd4fa38a57b3d593acf257314a45..8ab64d6c076e0be9a3c2220b9bb8739d9d15057c 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -18,7 +18,6 @@ btrfs-handle-memory-allocation-failure-in-btrfs_csum.patch
 asoc-soc-pcm-test-if-a-be-can-be-prepared.patch
 parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch
 parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch
-mips-restore-au1300-support.patch
 mips-alchemy-fix-dbdma2.patch
 mips-move-initrd_start-check-after-initrd-address-sa.patch
 asoc-dwc-move-dma-init-to-snd_soc_dai_driver-probe.patch

diff --git a/queue-5.15/mips-restore-au1300-support.patch b/queue-5.15/mips-restore-au1300-support.patch
deleted file mode 100644 (file)
index 4507f61..0000000
--- a/queue-5.15/mips-restore-au1300-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 599caaf5f2a1b25fdb4bdd5dc4221d576aa90f97 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 May 2023 12:33:23 +0200
-Subject: MIPS: Restore Au1300 support
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ]
-
-The Au1300, at least the one I have to test, uses the NetLogic vendor
-ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also
-dropped Au1300 detection.  Restore Au1300 detection.
-
-Tested on DB1300 with Au1380 chip.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/kernel/cpu-probe.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
-index 7c861e6a89529..df40880d84495 100644
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -1565,6 +1565,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
-                       break;
-               }
-               break;
-+      case PRID_IMP_NETLOGIC_AU13XX:
-+              c->cputype = CPU_ALCHEMY;
-+              __cpu_name[cpu] = "Au1300";
-+              break;
-       }
- }
- 
-@@ -2005,6 +2009,7 @@ void cpu_probe(void)
-               cpu_probe_mips(c, cpu);
-               break;
-       case PRID_COMP_ALCHEMY:
-+      case PRID_COMP_NETLOGIC:
-               cpu_probe_alchemy(c, cpu);
-               break;
-       case PRID_COMP_SIBYTE:
--- 
-2.39.2
-

diff --git a/queue-5.15/series b/queue-5.15/series
index a6a9740dc6d31a9909dc83ac8ef88ae80050424d..35f5682e010760025c393369dd87ea3fa966cbc1 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -22,7 +22,6 @@ asoc-soc-pcm-test-if-a-be-can-be-prepared.patch
 parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch
 parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch
 mips-unhide-pata_platform.patch
-mips-restore-au1300-support.patch
 mips-alchemy-fix-dbdma2.patch
 mips-move-initrd_start-check-after-initrd-address-sa.patch
 asoc-dwc-move-dma-init-to-snd_soc_dai_driver-probe.patch

diff --git a/queue-5.4/mips-restore-au1300-support.patch b/queue-5.4/mips-restore-au1300-support.patch
deleted file mode 100644 (file)
index 3594ba5..0000000
--- a/queue-5.4/mips-restore-au1300-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 08396271c918fbd2764ed4d8b459483c742783b0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 10 May 2023 12:33:23 +0200
-Subject: MIPS: Restore Au1300 support
-
-From: Manuel Lauss <manuel.lauss@gmail.com>
-
-[ Upstream commit f2041708dee30a3425f680265c337acd28293782 ]
-
-The Au1300, at least the one I have to test, uses the NetLogic vendor
-ID, but commit 95b8a5e0111a ("MIPS: Remove NETLOGIC support") also
-dropped Au1300 detection.  Restore Au1300 detection.
-
-Tested on DB1300 with Au1380 chip.
-
-Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
-Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/kernel/cpu-probe.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
-index f521cbf934e76..0307ff2337d5b 100644
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -1763,6 +1763,10 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
-                       break;
-               }
-               break;
-+      case PRID_IMP_NETLOGIC_AU13XX:
-+              c->cputype = CPU_ALCHEMY;
-+              __cpu_name[cpu] = "Au1300";
-+              break;
-       }
- }
- 
-@@ -2092,6 +2096,7 @@ void cpu_probe(void)
-               cpu_probe_mips(c, cpu);
-               break;
-       case PRID_COMP_ALCHEMY:
-+      case PRID_COMP_NETLOGIC:
-               cpu_probe_alchemy(c, cpu);
-               break;
-       case PRID_COMP_SIBYTE:
--- 
-2.39.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 814ea0870b03105c6df7d4651fc6a1ed5dd549d9..e59725815a5af45a76c39fc6e8451c58e38e5a61 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -14,7 +14,6 @@ power-supply-fix-logic-checking-if-system-is-running.patch
 btrfs-handle-memory-allocation-failure-in-btrfs_csum.patch
 parisc-improve-cache-flushing-for-pcxl-in-arch_sync_.patch
 parisc-flush-gatt-writes-and-adjust-gatt-mask-in-par.patch
-mips-restore-au1300-support.patch
 mips-alchemy-fix-dbdma2.patch
 mips-move-initrd_start-check-after-initrd-address-sa.patch
 xen-blkfront-only-check-req_fua-for-writes.patch