From a13da771f0698f838df9dbf6f24acf962bc20324 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 3 Apr 2020 00:23:37 +0200 Subject: [PATCH] Update patches --- patches/4.19/0001-surface3-power.patch | 4 ++-- patches/4.19/0002-surface3-spi.patch | 4 ++-- patches/4.19/0003-surface3-oemb.patch | 18 ++++++++++-------- patches/4.19/0004-surface-buttons.patch | 4 ++-- patches/4.19/0005-surface-sam.patch | 4 ++-- patches/4.19/0006-suspend.patch | 4 ++-- patches/4.19/0007-ipts.patch | 4 ++-- patches/4.19/0008-surface-lte.patch | 4 ++-- patches/4.19/0009-ioremap_uc.patch | 4 ++-- patches/4.19/0010-wifi.patch | 4 ++-- patches/5.5/0001-surface3-power.patch | 4 ++-- patches/5.5/0002-surface3-spi.patch | 4 ++-- patches/5.5/0003-surface3-oemb.patch | 18 ++++++++++-------- patches/5.5/0004-surface-sam.patch | 4 ++-- patches/5.5/0005-surface-lte.patch | 4 ++-- patches/5.5/0006-wifi.patch | 4 ++-- patches/5.5/0007-ipts.patch | 15 ++++++++------- patches/5.6/0001-surface3-power.patch | 2 +- patches/5.6/0002-surface3-spi.patch | 2 +- patches/5.6/0003-surface3-oemb.patch | 16 +++++++++------- patches/5.6/0004-surface-sam.patch | 2 +- patches/5.6/0005-surface-lte.patch | 2 +- patches/5.6/0006-wifi.patch | 2 +- patches/5.6/0007-ipts.patch | 2 +- 24 files changed, 71 insertions(+), 64 deletions(-) diff --git a/patches/4.19/0001-surface3-power.patch b/patches/4.19/0001-surface3-power.patch index 0115d20f8..21e97cd67 100644 --- a/patches/4.19/0001-surface3-power.patch +++ b/patches/4.19/0001-surface3-power.patch @@ -1,4 +1,4 @@ -From b932081d4a4690f34c928abf1beaa784a50fa3fe Mon Sep 17 00:00:00 2001 +From b50d617e2eee9791180395ca60841f20442c5b95 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 28 Sep 2019 18:00:43 +0200 Subject: [PATCH 01/10] surface3-power @@ -651,5 +651,5 @@ index 000000000000..e0af01a60302 +MODULE_DESCRIPTION("mshw0011 driver"); +MODULE_LICENSE("GPL v2"); -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0002-surface3-spi.patch b/patches/4.19/0002-surface3-spi.patch index 0bdc252a8..17b352da5 100644 --- a/patches/4.19/0002-surface3-spi.patch +++ b/patches/4.19/0002-surface3-spi.patch @@ -1,4 +1,4 @@ -From 8255cdea04cc9c59a5e702f0e5acadd2f258eab6 Mon Sep 17 00:00:00 2001 +From 71ab90b1a4fde2bcf91d5cb7cb278c792c89f653 Mon Sep 17 00:00:00 2001 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> Date: Fri, 6 Dec 2019 23:10:30 +0900 Subject: [PATCH 02/10] surface3-spi @@ -59,5 +59,5 @@ index 5db0f1c4ef38..8935ddbc2357 100644 } -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0003-surface3-oemb.patch b/patches/4.19/0003-surface3-oemb.patch index 400120114..26d09d22b 100644 --- a/patches/4.19/0003-surface3-oemb.patch +++ b/patches/4.19/0003-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 000864916c307c9f6b7a1af544f241a8927cd732 Mon Sep 17 00:00:00 2001 +From f109cbf36e5acdf7829d19b642e4a23ef6476ce4 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Tue, 18 Sep 2018 11:01:37 +0800 Subject: [PATCH 03/10] surface3-oemb @@ -6,8 +6,8 @@ Subject: [PATCH 03/10] surface3-oemb --- drivers/platform/x86/surface3-wmi.c | 7 +++++++ sound/soc/codecs/rt5645.c | 9 +++++++++ - sound/soc/intel/common/soc-acpi-intel-cht-match.c | 6 ++++++ - 3 files changed, 22 insertions(+) + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++ + 3 files changed, 24 insertions(+) diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c index 25b176996cb7..58d11877677f 100644 @@ -48,22 +48,24 @@ index 7e3b47eeea04..85c0731dfd4b 100644 /* * Match for the GPDwin which unfortunately uses somewhat diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -index 91bb99b69601..c9f966bacfc1 100644 +index 91bb99b69601..8418938b32ad 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -@@ -35,6 +35,12 @@ static const struct dmi_system_id cht_table[] = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), +@@ -36,6 +36,14 @@ static const struct dmi_system_id cht_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"), }, + }, ++ { + .callback = cht_surface_quirk_cb, + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."), + DMI_MATCH(DMI_SYS_VENDOR, "OEMB"), + DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"), + }, - }, ++ }, { } }; + -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0004-surface-buttons.patch b/patches/4.19/0004-surface-buttons.patch index 763badbe3..937670a41 100644 --- a/patches/4.19/0004-surface-buttons.patch +++ b/patches/4.19/0004-surface-buttons.patch @@ -1,4 +1,4 @@ -From 29532061e18b218be50e52966d52a3ab1c1dbd85 Mon Sep 17 00:00:00 2001 +From c924fb68b7aa19fd8947991f128c56296e9b678d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Jul 2019 17:51:37 +0200 Subject: [PATCH 04/10] surface-buttons @@ -270,5 +270,5 @@ index 1b491690ce07..96627627060e 100644 if (!button) return -ENOMEM; -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0005-surface-sam.patch b/patches/4.19/0005-surface-sam.patch index 10b9ab9aa..2df8b22c4 100644 --- a/patches/4.19/0005-surface-sam.patch +++ b/patches/4.19/0005-surface-sam.patch @@ -1,4 +1,4 @@ -From b52e4b39f0a890c467bb5616b010dbe2f93a6e3e Mon Sep 17 00:00:00 2001 +From 91a78cc8ef8f5b822dc5e0367d11321e64251667 Mon Sep 17 00:00:00 2001 From: qzed Date: Mon, 26 Aug 2019 01:15:40 +0200 Subject: [PATCH 05/10] surface-sam @@ -7548,5 +7548,5 @@ index c66a04d24f1d..6b48fdfb2005 100644 if (!ctrl->serdev) return -ENODEV; -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0006-suspend.patch b/patches/4.19/0006-suspend.patch index 05443d0dc..53cbfe54e 100644 --- a/patches/4.19/0006-suspend.patch +++ b/patches/4.19/0006-suspend.patch @@ -1,4 +1,4 @@ -From a770b09614e53afd014b85a7bd79d6c10c90d2f6 Mon Sep 17 00:00:00 2001 +From 263250b920776cdc295f6317c028191db6623f53 Mon Sep 17 00:00:00 2001 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> Date: Sat, 28 Sep 2019 17:48:21 +0200 Subject: [PATCH 06/10] suspend @@ -312,5 +312,5 @@ index b1f297f4b7b0..94ab2fc800d3 100644 #ifdef CONFIG_PCIEAER -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0007-ipts.patch b/patches/4.19/0007-ipts.patch index 4e8bb3a1e..e23595fd4 100644 --- a/patches/4.19/0007-ipts.patch +++ b/patches/4.19/0007-ipts.patch @@ -1,4 +1,4 @@ -From 9c8623f624d31b18be85f69684c7e5d07102fbb1 Mon Sep 17 00:00:00 2001 +From 5ae0ab65b746c3298aadabadd1ad5bbbac75de94 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 28 Sep 2019 17:58:17 +0200 Subject: [PATCH 07/10] ipts @@ -7427,5 +7427,5 @@ index 000000000000..bfa8e1375926 + +#endif // IPTS_H -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0008-surface-lte.patch b/patches/4.19/0008-surface-lte.patch index a6d7ac0b7..c66354864 100644 --- a/patches/4.19/0008-surface-lte.patch +++ b/patches/4.19/0008-surface-lte.patch @@ -1,4 +1,4 @@ -From 3fdfb22a2d964dc0f89db2ab444b7aaf855b35eb Mon Sep 17 00:00:00 2001 +From df219c06e6a1785faa283682974c41ba61bfce69 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 28 Sep 2019 18:02:03 +0200 Subject: [PATCH 08/10] surface-lte @@ -20,5 +20,5 @@ index 613f91add03d..e1428222dd73 100644 /* Huawei devices */ {DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */ -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0009-ioremap_uc.patch b/patches/4.19/0009-ioremap_uc.patch index 29296fc54..f89bb0176 100644 --- a/patches/4.19/0009-ioremap_uc.patch +++ b/patches/4.19/0009-ioremap_uc.patch @@ -1,4 +1,4 @@ -From dd5b315097f1f0eb3bf3e81f355cd7d7afc4bef5 Mon Sep 17 00:00:00 2001 +From 34845744043e4e3c3f2bc0a4202c93c5e27bc14d Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Wed, 16 Oct 2019 15:06:28 -0600 Subject: [PATCH 09/10] ioremap_uc @@ -93,5 +93,5 @@ index aa0f5308ac6b..75ea32d9b661 100644 * devm_ioremap_nocache - Managed ioremap_nocache() * @dev: Generic device to remap IO address for -- -2.25.1 +2.26.0 diff --git a/patches/4.19/0010-wifi.patch b/patches/4.19/0010-wifi.patch index c1a9ce1f1..f459bae57 100644 --- a/patches/4.19/0010-wifi.patch +++ b/patches/4.19/0010-wifi.patch @@ -1,4 +1,4 @@ -From 2b22581e4dd5184f87f264af7499cc034b543cb6 Mon Sep 17 00:00:00 2001 +From 4f727acf39a87273cada07975102cb3e7d452057 Mon Sep 17 00:00:00 2001 From: sebanc <22224731+sebanc@users.noreply.github.com> Date: Mon, 4 Nov 2019 09:30:57 +0100 Subject: [PATCH 10/10] wifi @@ -230,5 +230,5 @@ index 4ed10cf82f9a..977b57c0908f 100644 /* Send cmd to FW to enable/disable 11D function */ state_11d = ENABLE_11D; -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0001-surface3-power.patch b/patches/5.5/0001-surface3-power.patch index 75b6b1fba..cb0ef922e 100644 --- a/patches/5.5/0001-surface3-power.patch +++ b/patches/5.5/0001-surface3-power.patch @@ -1,4 +1,4 @@ -From fffa55005ebcb790bb06de17dd629fe921849d73 Mon Sep 17 00:00:00 2001 +From e071e858f883c0dd91ed72e2809573264b446524 Mon Sep 17 00:00:00 2001 From: qzed Date: Tue, 17 Sep 2019 17:17:56 +0200 Subject: [PATCH 1/7] surface3-power @@ -651,5 +651,5 @@ index 000000000000..e0af01a60302 +MODULE_DESCRIPTION("mshw0011 driver"); +MODULE_LICENSE("GPL v2"); -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0002-surface3-spi.patch b/patches/5.5/0002-surface3-spi.patch index 8466cefac..2742eaf3b 100644 --- a/patches/5.5/0002-surface3-spi.patch +++ b/patches/5.5/0002-surface3-spi.patch @@ -1,4 +1,4 @@ -From 0196c30f6df1a30ce6edd99c47f44435b0ee2c18 Mon Sep 17 00:00:00 2001 +From 9dbd1036ec146ab0b1c0fbdb818f5e260281ecbb Mon Sep 17 00:00:00 2001 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> Date: Fri, 6 Dec 2019 23:10:30 +0900 Subject: [PATCH 2/7] surface3-spi @@ -59,5 +59,5 @@ index ce4828b1415a..63b0b8ddf090 100644 } -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0003-surface3-oemb.patch b/patches/5.5/0003-surface3-oemb.patch index 70db36704..e9a2840f3 100644 --- a/patches/5.5/0003-surface3-oemb.patch +++ b/patches/5.5/0003-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 32cf290466d335c1d0f4cd70081900a6bd0e89ab Mon Sep 17 00:00:00 2001 +From 9f43fdb0ceefb548c39885cd5b54ea3c284aa4db Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Tue, 18 Sep 2018 11:01:37 +0800 Subject: [PATCH 3/7] surface3-oemb @@ -6,8 +6,8 @@ Subject: [PATCH 3/7] surface3-oemb --- drivers/platform/x86/surface3-wmi.c | 7 +++++++ sound/soc/codecs/rt5645.c | 9 +++++++++ - sound/soc/intel/common/soc-acpi-intel-cht-match.c | 6 ++++++ - 3 files changed, 22 insertions(+) + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++ + 3 files changed, 24 insertions(+) diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c index 130b6f52a600..801083aa56d6 100644 @@ -48,22 +48,24 @@ index 92d67010aeed..cdfd75acd1a5 100644 /* * Match for the GPDwin which unfortunately uses somewhat diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -index d0fb43c2b9f6..de2583918afd 100644 +index d0fb43c2b9f6..0e938713cb13 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -@@ -26,6 +26,12 @@ static const struct dmi_system_id cht_table[] = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), +@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"), }, + }, ++ { + .callback = cht_surface_quirk_cb, + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."), + DMI_MATCH(DMI_SYS_VENDOR, "OEMB"), + DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"), + }, - }, ++ }, { } }; + -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0004-surface-sam.patch b/patches/5.5/0004-surface-sam.patch index 8bbe25a3b..18c600d2d 100644 --- a/patches/5.5/0004-surface-sam.patch +++ b/patches/5.5/0004-surface-sam.patch @@ -1,4 +1,4 @@ -From d0ed27ff92f5bf9cd70cafc30de03f7051cdaa23 Mon Sep 17 00:00:00 2001 +From 45ed13097d294c78ced0b0430d292b26faa4e2cf Mon Sep 17 00:00:00 2001 From: qzed Date: Mon, 26 Aug 2019 01:11:08 +0200 Subject: [PATCH 4/7] surface-sam @@ -7371,5 +7371,5 @@ index 000000000000..a00763805eca +MODULE_DESCRIPTION("Virtual HID Framework Driver for 5th Generation Surface Devices"); +MODULE_LICENSE("GPL v2"); -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0005-surface-lte.patch b/patches/5.5/0005-surface-lte.patch index 68f939dcb..55b6f44ce 100644 --- a/patches/5.5/0005-surface-lte.patch +++ b/patches/5.5/0005-surface-lte.patch @@ -1,4 +1,4 @@ -From 57027f7807afd9632dc87270fcfb000a8496ce32 Mon Sep 17 00:00:00 2001 +From cd26a693cd81df5c65072e55c68ff8439dd86c8a Mon Sep 17 00:00:00 2001 From: qzed Date: Tue, 17 Sep 2019 17:21:43 +0200 Subject: [PATCH 5/7] surface-lte @@ -20,5 +20,5 @@ index 613f91add03d..e1428222dd73 100644 /* Huawei devices */ {DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */ -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0006-wifi.patch b/patches/5.5/0006-wifi.patch index 39acca88d..90d309e07 100644 --- a/patches/5.5/0006-wifi.patch +++ b/patches/5.5/0006-wifi.patch @@ -1,4 +1,4 @@ -From a926655d1999213564b845bb2db49d777a8c0a85 Mon Sep 17 00:00:00 2001 +From a5d582724403b17bfef0ce7099afd84a24ecb18e Mon Sep 17 00:00:00 2001 From: sebanc <22224731+sebanc@users.noreply.github.com> Date: Mon, 4 Nov 2019 09:30:57 +0100 Subject: [PATCH 6/7] wifi @@ -227,5 +227,5 @@ index 4ed10cf82f9a..977b57c0908f 100644 /* Send cmd to FW to enable/disable 11D function */ state_11d = ENABLE_11D; -- -2.25.1 +2.26.0 diff --git a/patches/5.5/0007-ipts.patch b/patches/5.5/0007-ipts.patch index 80751c69b..6b5899b0b 100644 --- a/patches/5.5/0007-ipts.patch +++ b/patches/5.5/0007-ipts.patch @@ -1,4 +1,4 @@ -From 503f194c91971b94a7a558e8108fa82b26c0d375 Mon Sep 17 00:00:00 2001 +From 3aab2704247a7ebd2acc49c6843aebddc67f3f20 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Mon, 27 Jan 2020 21:16:20 +0100 Subject: [PATCH 7/7] ipts @@ -29,7 +29,7 @@ Subject: [PATCH 7/7] ipts .../input/touchscreen/ipts/protocol/payload.h | 47 ++++ .../touchscreen/ipts/protocol/responses.h | 62 ++++ .../touchscreen/ipts/protocol/singletouch.h | 17 ++ - .../input/touchscreen/ipts/protocol/stylus.h | 51 ++++ + .../input/touchscreen/ipts/protocol/stylus.h | 52 ++++ drivers/input/touchscreen/ipts/receiver.c | 265 ++++++++++++++++++ drivers/input/touchscreen/ipts/receiver.h | 8 + drivers/input/touchscreen/ipts/resources.c | 131 +++++++++ @@ -41,7 +41,7 @@ Subject: [PATCH 7/7] ipts drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 2 + include/uapi/linux/input.h | 1 + - 37 files changed, 1734 insertions(+) + 37 files changed, 1735 insertions(+) create mode 100644 drivers/input/touchscreen/ipts/Kconfig create mode 100644 drivers/input/touchscreen/ipts/Makefile create mode 100644 drivers/input/touchscreen/ipts/context.h @@ -1215,10 +1215,10 @@ index 000000000000..bf9912ee2af4 +#endif /* _IPTS_PROTOCOL_SINGLETOUCH_H_ */ diff --git a/drivers/input/touchscreen/ipts/protocol/stylus.h b/drivers/input/touchscreen/ipts/protocol/stylus.h new file mode 100644 -index 000000000000..1ae63c49bc07 +index 000000000000..950850b365df --- /dev/null +++ b/drivers/input/touchscreen/ipts/protocol/stylus.h -@@ -0,0 +1,51 @@ +@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef _IPTS_PROTOCOL_STYLUS_H_ @@ -1252,11 +1252,12 @@ index 000000000000..1ae63c49bc07 +} __packed; + +struct ipts_stylus_report_data_no_tilt { ++ u8 reserved[4]; + u8 mode; + u16 x; + u16 y; + u16 pressure; -+ u8 reserved[5]; ++ u8 reserved2; +} __packed; + +#define IPTS_STYLUS_REPORT_MODE_PROX BIT(0) @@ -2069,5 +2070,5 @@ index 9a61c28ed3ae..47fc20975245 100644 /* * MT_TOOL types -- -2.25.1 +2.26.0 diff --git a/patches/5.6/0001-surface3-power.patch b/patches/5.6/0001-surface3-power.patch index 00d54f4cb..a3cd56106 100644 --- a/patches/5.6/0001-surface3-power.patch +++ b/patches/5.6/0001-surface3-power.patch @@ -1,4 +1,4 @@ -From 625354802f1c5b57d1644456dff9bdd65c58cf7b Mon Sep 17 00:00:00 2001 +From e784410139d3e1ba337a5e198280502e5cc710f0 Mon Sep 17 00:00:00 2001 From: qzed Date: Tue, 17 Sep 2019 17:17:56 +0200 Subject: [PATCH 1/7] surface3-power diff --git a/patches/5.6/0002-surface3-spi.patch b/patches/5.6/0002-surface3-spi.patch index 15300cd33..8ce8704dc 100644 --- a/patches/5.6/0002-surface3-spi.patch +++ b/patches/5.6/0002-surface3-spi.patch @@ -1,4 +1,4 @@ -From 2ab30dc81ee181b5cac30072d72a2ddc97846268 Mon Sep 17 00:00:00 2001 +From 8e51a8d67ca029de2b4ff81f80759103284833eb Mon Sep 17 00:00:00 2001 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com> Date: Fri, 6 Dec 2019 23:10:30 +0900 Subject: [PATCH 2/7] surface3-spi diff --git a/patches/5.6/0003-surface3-oemb.patch b/patches/5.6/0003-surface3-oemb.patch index 932383c3e..7f19c5c82 100644 --- a/patches/5.6/0003-surface3-oemb.patch +++ b/patches/5.6/0003-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 200ba95ab35862cde31aff4e934f8fe237667a50 Mon Sep 17 00:00:00 2001 +From 8bb89389e0c9c1f25b28ec32c8ebc990bf91c7ca Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Tue, 18 Sep 2018 11:01:37 +0800 Subject: [PATCH 3/7] surface3-oemb @@ -6,8 +6,8 @@ Subject: [PATCH 3/7] surface3-oemb --- drivers/platform/x86/surface3-wmi.c | 7 +++++++ sound/soc/codecs/rt5645.c | 9 +++++++++ - sound/soc/intel/common/soc-acpi-intel-cht-match.c | 6 ++++++ - 3 files changed, 22 insertions(+) + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++ + 3 files changed, 24 insertions(+) diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c index 130b6f52a600..801083aa56d6 100644 @@ -48,22 +48,24 @@ index 92d67010aeed..cdfd75acd1a5 100644 /* * Match for the GPDwin which unfortunately uses somewhat diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -index d0fb43c2b9f6..de2583918afd 100644 +index d0fb43c2b9f6..0e938713cb13 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c -@@ -26,6 +26,12 @@ static const struct dmi_system_id cht_table[] = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), +@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"), }, + }, ++ { + .callback = cht_surface_quirk_cb, + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."), + DMI_MATCH(DMI_SYS_VENDOR, "OEMB"), + DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"), + }, - }, ++ }, { } }; + -- 2.26.0 diff --git a/patches/5.6/0004-surface-sam.patch b/patches/5.6/0004-surface-sam.patch index 9978ef7ae..8aaa42a83 100644 --- a/patches/5.6/0004-surface-sam.patch +++ b/patches/5.6/0004-surface-sam.patch @@ -1,4 +1,4 @@ -From d723ddb5b16fd573e344bf9b2a95aa306296bb5e Mon Sep 17 00:00:00 2001 +From 45c68e8472cab23d0c613c253dbdb910d8ad6960 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 6 Dec 2019 11:56:12 +0100 Subject: [PATCH 4/7] surface-sam diff --git a/patches/5.6/0005-surface-lte.patch b/patches/5.6/0005-surface-lte.patch index 443b9216e..b092e8e4b 100644 --- a/patches/5.6/0005-surface-lte.patch +++ b/patches/5.6/0005-surface-lte.patch @@ -1,4 +1,4 @@ -From da6c218c89955fefa0b79b4fc048c88be9b59289 Mon Sep 17 00:00:00 2001 +From ae6919f0d34d7544fee84e194ab012a991c91509 Mon Sep 17 00:00:00 2001 From: qzed Date: Tue, 17 Sep 2019 17:21:43 +0200 Subject: [PATCH 5/7] surface-lte diff --git a/patches/5.6/0006-wifi.patch b/patches/5.6/0006-wifi.patch index df356d0b2..be84b69e1 100644 --- a/patches/5.6/0006-wifi.patch +++ b/patches/5.6/0006-wifi.patch @@ -1,4 +1,4 @@ -From 8d1fd45c329de89940d6ab85f5f719d014e1c735 Mon Sep 17 00:00:00 2001 +From 45bbf4df63490b6d7d6bb7d0bfb36428fe5b9cfe Mon Sep 17 00:00:00 2001 From: sebanc <22224731+sebanc@users.noreply.github.com> Date: Mon, 4 Nov 2019 09:30:57 +0100 Subject: [PATCH 6/7] wifi diff --git a/patches/5.6/0007-ipts.patch b/patches/5.6/0007-ipts.patch index 09d4fd765..df73d27e0 100644 --- a/patches/5.6/0007-ipts.patch +++ b/patches/5.6/0007-ipts.patch @@ -1,4 +1,4 @@ -From 9752cae244318fd590ca0d2dfe9c73fc94c0a8e9 Mon Sep 17 00:00:00 2001 +From 784492d8a39f9c865430fb8c21bd313794a27f35 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Mon, 27 Jan 2020 21:16:20 +0100 Subject: [PATCH 7/7] ipts