8e8811cd28
Changes: SAM: - Fix bug that can cause IRQ storm when SSAM wake IRQ gets triggered. - Continued internal restructuring. - Other small bug fixes. Links: - kernel:9d7730b64c
- SAM:b9fe8f28b7
72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
From 13678467f26a34ff4a23c0581233d894a05e65b5 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 2/6] 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 130b6f52a6001..801083aa56d6d 100644
|
|
--- a/drivers/platform/x86/surface3-wmi.c
|
|
+++ b/drivers/platform/x86/surface3-wmi.c
|
|
@@ -37,6 +37,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 c83f7f5da96b7..e6bfe684d6be8 100644
|
|
--- a/sound/soc/codecs/rt5645.c
|
|
+++ b/sound/soc/codecs/rt5645.c
|
|
@@ -3681,6 +3681,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 d0fb43c2b9f68..0e938713cb133 100644
|
|
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
|
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
|
@@ -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.28.0
|
|
|