c7caeec62c
Update patches via linux-surface/kernel@fccd0a489e. Updated patches: pick ea097eb Add secureboot pre-signing to the kernel pick b50d617 surface3-power pick 71ab90b surface3-spi pick f109cbf surface3-oemb pick c924fb6 surface-buttons f 1a44682d3bea Input: soc_button_array - fix Wdiscarded-qualifiers for kernels below 4.20 pick 91a78cc surface-sam pick 263250b suspend pick 5ae0ab6 ipts f a5db77a8ad47 ipts: Simplify feedback implementation f 22c959edeaf2 ipts: Remove no_feedback quirk f 21a71ef429b4 ipts: Remove quirk implementation f f28c0f7b64aa ipts: companion: improve comment for hardware id on SP4 pick df219c0 surface-lte pick 3484574 ioremap_uc pick 4f727ac wifi f f86788d75e54 Revert "BACKPORT: wireless/mwifiex: Fix S0ix / suspend" f 169bb34570af mwifiex: pcie: Use dev_get_drvdata f 6e9eefbca821 mwifiex_pcie: remove()/probe() card on suspend()/resume() f 3619cec06fdc mwifiex_pcie: disable parent bridge_d3 f fda9d444d14d mwifiex: sta_cmd: do not enable auto_ds by default f 74ab58241354 mwifiex: sta_cmd: add comment for not enabling ps_mode by default Note: almost all part of the ioremap_uc patch is now upstream. So, the remaining unupstreamed patch is now only linux-surface/kernel@de067f5c12 ("docs: driver-model: add devm_ioremap_uc") Signed-off-by: Tsuchiya Yuto (kitakar5525) <kitakar@gmail.com>
72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
From c9fd73ef014ee91d0cda46c2c456ae579ba3b4e0 Mon Sep 17 00:00:00 2001
|
|
From: Chih-Wei Huang <cwhuang@linux.org.tw>
|
|
Date: Tue, 18 Sep 2018 11:01:37 +0800
|
|
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 | 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
|
|
--- a/drivers/platform/x86/surface3-wmi.c
|
|
+++ b/drivers/platform/x86/surface3-wmi.c
|
|
@@ -41,6 +41,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
|
},
|
|
},
|
|
+ {
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
|
+ },
|
|
+ },
|
|
#endif
|
|
{ }
|
|
};
|
|
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
|
index 7e3b47eeea04..85c0731dfd4b 100644
|
|
--- a/sound/soc/codecs/rt5645.c
|
|
+++ b/sound/soc/codecs/rt5645.c
|
|
@@ -3706,6 +3706,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
|
},
|
|
.driver_data = (void *)&intel_braswell_platform_data,
|
|
},
|
|
+ {
|
|
+ .ident = "Microsoft Surface 3",
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
|
+ },
|
|
+ .driver_data = (void *)&intel_braswell_platform_data,
|
|
+ },
|
|
{
|
|
/*
|
|
* 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..8418938b32ad 100644
|
|
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
|
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
|
@@ -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.26.2
|
|
|