aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2014-07-09 04:18:19 -0400
committerMatthew Garrett <matthew.garrett@nebula.com>2014-08-16 04:23:50 -0400
commitc66263a368490a200a65639ff826f633090936a9 (patch)
tree647472950ae68db0b8a7ef4cc819ae7de6901f04
parentf515623cac706e616c48778e5e611020dff44e19 (diff)
asus-nb-wmi: Add ASUSTeK COMPUTER INC. X200CA
BIOS won't light on the wifi-led after S3, so asus-wmi driver needs to control the wifi and wifi-led status. But, it'll lead to bt status error if asus-wmi driver controls bt as well. So, for X200CA, asus-wmi driver controls wifi status only and have to set wapf to 1. Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
-rw-r--r--drivers/platform/x86/asus-nb-wmi.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index d3641e043e47..8cbf488df0f3 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -74,6 +74,10 @@ static struct quirk_entry quirk_asus_x401u = {
74 .wapf = 4, 74 .wapf = 4,
75}; 75};
76 76
77static struct quirk_entry quirk_asus_x200ca = {
78 .wapf = 2,
79};
80
77static int dmi_matched(const struct dmi_system_id *dmi) 81static int dmi_matched(const struct dmi_system_id *dmi)
78{ 82{
79 quirks = dmi->driver_data; 83 quirks = dmi->driver_data;
@@ -216,6 +220,15 @@ static struct dmi_system_id asus_quirks[] = {
216 }, 220 },
217 .driver_data = &quirk_asus_x401u, 221 .driver_data = &quirk_asus_x401u,
218 }, 222 },
223 {
224 .callback = dmi_matched,
225 .ident = "ASUSTeK COMPUTER INC. X200CA",
226 .matches = {
227 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
228 DMI_MATCH(DMI_PRODUCT_NAME, "X200CA"),
229 },
230 .driver_data = &quirk_asus_x200ca,
231 },
219 {}, 232 {},
220}; 233};
221 234