aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMatthew Gyurgyik <matthew@gyurgyik.io>2020-07-03 14:08:25 -0700
committerDavid Bauer <mail@david-bauer.net>2020-07-06 17:57:33 +0200
commitbb14d44039f0504331c894d837a1b60a90eb27e3 (patch)
tree00578e89c824ba5052f4e6b9a665c81e78ecf23e /target
parentf855eb91b3a075ba6849ba0c0139e30ed78820b5 (diff)
downloadupstream-bb14d44039f0504331c894d837a1b60a90eb27e3.tar.gz
upstream-bb14d44039f0504331c894d837a1b60a90eb27e3.tar.bz2
upstream-bb14d44039f0504331c894d837a1b60a90eb27e3.zip
kernel/pcengines-apu2: detect apuv4 board
Upstream commit 3d00da1de3 ("platform/x86: pcengines-apuv2: detect apuv4 board") On 5.4, this module fails on APUv4 due to non-matching DMI data. With this patch, the module will match DMI data for the APUv4. Signed-off-by: Matthew Gyurgyik <matthew@gyurgyik.io> [include upstream patch description] Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/patches-5.4/012-pcengines-apu2-detect-apuv4-board.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/x86/patches-5.4/012-pcengines-apu2-detect-apuv4-board.patch b/target/linux/x86/patches-5.4/012-pcengines-apu2-detect-apuv4-board.patch
new file mode 100644
index 0000000000..1be9a60229
--- /dev/null
+++ b/target/linux/x86/patches-5.4/012-pcengines-apu2-detect-apuv4-board.patch
@@ -0,0 +1,50 @@
+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
+@@ -186,6 +186,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,
++ },
+ {}
+ };
+