From: Rui Salvaterra Date: Thu, 7 Apr 2022 16:14:38 +0000 (+0100) Subject: kernel: x86: remove an upstreamed patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e837bc5d83a7c8b8433748ab875b6f23357f56a;p=openwrt%2Fstaging%2Fchunkeey.git 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 Signed-off-by: Rui Salvaterra --- 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" -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 -Signed-off-by: Andy Shevchenko ---- - 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" -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 -Signed-off-by: Andy Shevchenko ---- - 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, -+ }, - {} - }; -