aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-04-07 17:14:38 +0100
committerRui Salvaterra <rsalvaterra@gmail.com>2022-04-20 11:53:07 +0100
commit6e837bc5d83a7c8b8433748ab875b6f23357f56a (patch)
tree3647e4e444096365f9f9b79068990b114cbf0e85 /target/linux/x86
parentc18c6e53b9860b248986cea4b6856806a65af73c (diff)
downloadupstream-6e837bc5d83a7c8b8433748ab875b6f23357f56a.tar.gz
upstream-6e837bc5d83a7c8b8433748ab875b6f23357f56a.tar.bz2
upstream-6e837bc5d83a7c8b8433748ab875b6f23357f56a.zip
kernel: x86: remove an upstreamed patch
012-pcengines-apu2-detect-apuv4-board.patch is upstream since Linux 5.5 [1]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.5&id=3d00da1de3ea36ba44f4a7ba76c8c8b16f98204b Acked-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch50
-rw-r--r--target/linux/x86/patches-5.15/012-pcengines-apu2-detect-apuv4-board.patch50
2 files changed, 0 insertions, 100 deletions
diff --git a/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch b/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch
deleted file mode 100644
index 520c66d292..0000000000
--- a/target/linux/x86/patches-5.10/012-pcengines-apu2-detect-apuv4-board.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3d00da1de3ea36ba44f4a7ba76c8c8b16f98204b Mon Sep 17 00:00:00 2001
-From: "Enrico Weigelt, metux IT consult" <info@metux.net>
-Date: Thu, 12 Dec 2019 14:27:56 +0100
-Subject: [PATCH] platform/x86: pcengines-apuv2: detect apuv4 board
-
-GPIO stuff on APUv4 seems to be the same as on APUv2, so we just
-need to match on DMI data.
-
-Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
----
- drivers/platform/x86/pcengines-apuv2.c | 27 ++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
---- a/drivers/platform/x86/pcengines-apuv2.c
-+++ b/drivers/platform/x86/pcengines-apuv2.c
-@@ -215,6 +215,33 @@ static const struct dmi_system_id apu_gp
- },
- .driver_data = (void *)&board_apu2,
- },
-+ /* APU4 w/ legacy bios < 4.0.8 */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "APU4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
-+ /* APU4 w/ legacy bios >= 4.0.8 */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "apu4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
-+ /* APU4 w/ mainline bios */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "PC Engines apu4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
- {}
- };
-
diff --git a/target/linux/x86/patches-5.15/012-pcengines-apu2-detect-apuv4-board.patch b/target/linux/x86/patches-5.15/012-pcengines-apu2-detect-apuv4-board.patch
deleted file mode 100644
index 520c66d292..0000000000
--- a/target/linux/x86/patches-5.15/012-pcengines-apu2-detect-apuv4-board.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3d00da1de3ea36ba44f4a7ba76c8c8b16f98204b Mon Sep 17 00:00:00 2001
-From: "Enrico Weigelt, metux IT consult" <info@metux.net>
-Date: Thu, 12 Dec 2019 14:27:56 +0100
-Subject: [PATCH] platform/x86: pcengines-apuv2: detect apuv4 board
-
-GPIO stuff on APUv4 seems to be the same as on APUv2, so we just
-need to match on DMI data.
-
-Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
----
- drivers/platform/x86/pcengines-apuv2.c | 27 ++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
---- a/drivers/platform/x86/pcengines-apuv2.c
-+++ b/drivers/platform/x86/pcengines-apuv2.c
-@@ -215,6 +215,33 @@ static const struct dmi_system_id apu_gp
- },
- .driver_data = (void *)&board_apu2,
- },
-+ /* APU4 w/ legacy bios < 4.0.8 */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "APU4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
-+ /* APU4 w/ legacy bios >= 4.0.8 */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "apu4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
-+ /* APU4 w/ mainline bios */
-+ {
-+ .ident = "apu4",
-+ .matches = {
-+ DMI_MATCH(DMI_SYS_VENDOR, "PC Engines"),
-+ DMI_MATCH(DMI_BOARD_NAME, "PC Engines apu4")
-+ },
-+ .driver_data = (void *)&board_apu2,
-+ },
- {}
- };
-