diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-13 00:05:06 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-13 00:05:06 -0400 |
| commit | 392fa7f938993656ab756bd1709162a78422e022 (patch) | |
| tree | 0a923c83b1a7abc9e98734b77581465b9efd96b5 | |
| parent | 88328ffdbafcab124544dd7ec4843f4e6b7e0513 (diff) | |
| download | longterm-queue-4.8-392fa7f938993656ab756bd1709162a78422e022.tar.gz | |
x86: asus-wmi: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch b/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch index 37ace7f..cbabd1b 100644 --- a/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch +++ b/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch @@ -1,4 +1,4 @@ -From 8023eff10e7b0327898f17f0b553d2e45c71cef3 Mon Sep 17 00:00:00 2001 +From cf33ea153081d47ca5155a5ad9da33adf15b8076 Mon Sep 17 00:00:00 2001 From: Kai-Chuan Hsieh <kai.chiuan@gmail.com> Date: Thu, 1 Sep 2016 23:55:55 +0800 Subject: [PATCH] platform/x86: asus-wmi: Set specified XUSB2PR value for @@ -72,13 +72,14 @@ Acked-by: Corentin Chary <corentin.chary@gmail.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> [andy: resolve merge conflict in asus-wmi.h] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index 26e4cbc34db8..3ac4f48895dd 100644 +index c4ed3e53c0ea..1685c1661a8f 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c -@@ -116,6 +116,10 @@ static struct quirk_entry quirk_asus_ux303ub = { - .wmi_backlight_native = true, +@@ -87,6 +87,10 @@ static struct quirk_entry quirk_no_rfkill_wapf4 = { + .no_rfkill = true, }; +static struct quirk_entry quirk_asus_x550lb = { @@ -88,9 +89,9 @@ index 26e4cbc34db8..3ac4f48895dd 100644 static int dmi_matched(const struct dmi_system_id *dmi) { quirks = dmi->driver_data; -@@ -398,6 +402,15 @@ static const struct dmi_system_id asus_quirks[] = { +@@ -360,6 +364,15 @@ static const struct dmi_system_id asus_quirks[] = { }, - .driver_data = &quirk_asus_ux303ub, + .driver_data = &quirk_no_rfkill, }, + { + .callback = dmi_matched, @@ -105,7 +106,7 @@ index 26e4cbc34db8..3ac4f48895dd 100644 }; diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index ce6ca31a2d09..43cb680adbb4 100644 +index 7c093a0b78bb..8cd689a4e3b8 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -156,6 +156,9 @@ MODULE_LICENSE("GPL"); @@ -148,9 +149,9 @@ index ce6ca31a2d09..43cb680adbb4 100644 /* * Hwmon device */ -@@ -2087,6 +2113,9 @@ static int asus_wmi_add(struct platform_device *pdev) - if (asus->driver->quirks->wmi_backlight_native) - acpi_video_set_dmi_backlight_type(acpi_backlight_native); +@@ -2084,6 +2110,9 @@ static int asus_wmi_add(struct platform_device *pdev) + if (asus->driver->quirks->wmi_backlight_power) + acpi_video_set_dmi_backlight_type(acpi_backlight_vendor); + if (asus->driver->quirks->xusb2pr) + asus_wmi_set_xusb2pr(asus); @@ -159,17 +160,17 @@ index ce6ca31a2d09..43cb680adbb4 100644 err = asus_wmi_backlight_init(asus); if (err && err != -ENODEV) diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h -index 0e19014e9f54..fdff626c3b51 100644 +index 5de1df510ebd..cd6b1080312d 100644 --- a/drivers/platform/x86/asus-wmi.h +++ b/drivers/platform/x86/asus-wmi.h -@@ -53,6 +53,7 @@ struct quirk_entry { +@@ -51,6 +51,7 @@ struct quirk_entry { * and let the ACPI interrupt to send out the key event. */ int no_display_toggle; + u32 xusb2pr; + }; - bool (*i8042_filter)(unsigned char data, unsigned char str, - struct serio *serio); + struct asus_wmi_driver { -- 2.12.0 |