summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2014-07-09 16:18:19 +0800
committerMatthew Garrett <matthew.garrett@nebula.com>2014-08-16 01:23:50 -0700
commitc66263a368490a200a65639ff826f633090936a9 (patch)
tree647472950ae68db0b8a7ef4cc819ae7de6901f04
parentf515623cac706e616c48778e5e611020dff44e19 (diff)
downloadblackbird-op-linux-c66263a368490a200a65639ff826f633090936a9.tar.gz
blackbird-op-linux-c66263a368490a200a65639ff826f633090936a9.zip
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 = {
.wapf = 4,
};
+static struct quirk_entry quirk_asus_x200ca = {
+ .wapf = 2,
+};
+
static int dmi_matched(const struct dmi_system_id *dmi)
{
quirks = dmi->driver_data;
@@ -216,6 +220,15 @@ static struct dmi_system_id asus_quirks[] = {
},
.driver_data = &quirk_asus_x401u,
},
+ {
+ .callback = dmi_matched,
+ .ident = "ASUSTeK COMPUTER INC. X200CA",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "X200CA"),
+ },
+ .driver_data = &quirk_asus_x200ca,
+ },
{},
};
OpenPOWER on IntegriCloud