Drop mips-restore-au1300-support.patch from older trees

diff --git a/queue-4.14/mips-restore-au1300-support.patch b/queue-4.14/mips-restore-au1300-support.patch
deleted file mode 100644 (file)
index d6192f9..0000000
--- a/queue-4.14/mips-restore-au1300-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4fa31969c89a8e9d5aa751a8294fbe72a35810a1 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 cf3fd549e16d0..f9368071a6bd9 100644
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -1686,6 +1686,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;
-       }
- }
- 
-@@ -1988,6 +1992,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-4.14/series b/queue-4.14/series
index fc4be47f6c64af59fa9490907e6f856b354dc067..aa725b9253c342be2bbed75ce7a6a76e37043a84 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -4,7 +4,6 @@ arm-dts-vexpress-add-missing-cache-properties.patch
 power-supply-ratelimit-no-data-debug-output.patch
 regulator-fix-error-checking-for-debugfs_create_dir.patch
 power-supply-fix-logic-checking-if-system-is-running.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

diff --git a/queue-4.19/mips-restore-au1300-support.patch b/queue-4.19/mips-restore-au1300-support.patch
deleted file mode 100644 (file)
index 86873f6..0000000
--- a/queue-4.19/mips-restore-au1300-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7523393915d0b3b430e984460c36bf3e1b18602f 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 581defb369c36..ef95f488de6b0 100644
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -1705,6 +1705,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;
-       }
- }
- 
-@@ -2017,6 +2021,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-4.19/series b/queue-4.19/series
index 3f7c70851c2a4ed73928b14b6069888231f8aa8c..2acab016e1180208d446c0fd2e175950ae0cc6a9 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -7,7 +7,6 @@ irqchip-meson-gpio-mark-of-related-data-as-maybe-unu.patch
 power-supply-fix-logic-checking-if-system-is-running.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