diff options
| -rw-r--r-- | config-x86-generic | 1 | ||||
| -rw-r--r-- | ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch | 73 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch | 10 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch | 45 |
6 files changed, 10 insertions, 130 deletions
diff --git a/config-x86-generic b/config-x86-generic index 4710201b7..8e4252f6a 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -225,6 +225,7 @@ CONFIG_HP_WMI=m # CONFIG_INTEL_SCU_IPC is not set CONFIG_DELL_WMI=m CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_SMO8800=m CONFIG_EEEPC_WMI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_SAMSUNG_Q10=m diff --git a/ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch b/ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch deleted file mode 100644 index 86d608664..000000000 --- a/ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch +++ /dev/null @@ -1,73 +0,0 @@ -Bugzilla: N/A -Upstream-status: Sent upstream for 3.16 - -From ec5a006650d13c183124bd4279b95625f85efc6d Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Mon, 2 Jun 2014 17:41:00 +0200 -Subject: [PATCH 03/14] ideapad-laptop: Blacklist rfkill control on the Lenovo - Yoga 2 11 - -The Lenovo Yoga 2 11 always reports everything as blocked, causing userspace -to not even try to use the wlan / bluetooth even though they work fine. - -Note this patch also removes the "else priv->rfk[i] = NULL;" bit of the -rfkill initialization, it is not necessary as the priv struct is allocated -with kzalloc. - -Reported-and-tested-by: Vincent Gerris <vgerris@gmail.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - drivers/platform/x86/ideapad-laptop.c | 23 ++++++++++++++++++----- - 1 file changed, 18 insertions(+), 5 deletions(-) - -diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c -index 6dd060a0bb65..219eb289a909 100644 ---- a/drivers/platform/x86/ideapad-laptop.c -+++ b/drivers/platform/x86/ideapad-laptop.c -@@ -36,6 +36,7 @@ - #include <linux/debugfs.h> - #include <linux/seq_file.h> - #include <linux/i8042.h> -+#include <linux/dmi.h> - - #define IDEAPAD_RFKILL_DEV_NUM (3) - -@@ -819,6 +820,19 @@ static void ideapad_acpi_notify(acpi_handle handle, u32 event, void *data) - } - } - -+/* Blacklist for devices where the ideapad rfkill interface does not work */ -+static struct dmi_system_id rfkill_blacklist[] = { -+ /* The Lenovo Yoga 2 11 always reports everything as blocked */ -+ { -+ .ident = "Lenovo Yoga 2 11", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2 11"), -+ }, -+ }, -+ {} -+}; -+ - static int ideapad_acpi_add(struct platform_device *pdev) - { - int ret, i; -@@ -854,11 +868,10 @@ static int ideapad_acpi_add(struct platform_device *pdev) - if (ret) - goto input_failed; - -- for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++) { -- if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg)) -- ideapad_register_rfkill(priv, i); -- else -- priv->rfk[i] = NULL; -+ if (!dmi_check_system(rfkill_blacklist)) { -+ for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++) -+ if (test_bit(ideapad_rfk_data[i].cfgbit, &priv->cfg)) -+ ideapad_register_rfkill(priv, i); - } - ideapad_sync_rfk_state(priv); - ideapad_sync_touchpad_state(priv); --- -1.9.0 - diff --git a/kernel.spec b/kernel.spec index a203635a9..6487f2cc7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -627,9 +627,7 @@ Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch Patch26000: perf-lib64.patch # Patch series from Hans for various backlight and platform driver fixes -Patch26001: thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -Patch26003: ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch Patch26004: asus-wmi-Add-a-no-backlight-quirk.patch Patch26005: eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch @@ -1343,9 +1341,7 @@ ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch ApplyPatch perf-lib64.patch # Patch series from Hans for various backlight and platform driver fixes -ApplyPatch thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch -ApplyPatch ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch ApplyPatch asus-wmi-Add-a-no-backlight-quirk.patch ApplyPatch eeepc-wmi-Add-no-backlight-quirk-for-Asus-H87I-PLUS-.patch ApplyPatch acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch @@ -2225,6 +2221,9 @@ fi # ||----w | # || || %changelog +* Fri Jun 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc0.git7.1 +- Linux v3.15-8556-gdfb945473ae8 + * Fri Jun 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc0.git6.1 - Linux v3.15-8351-g9ee4d7a65383 diff --git a/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch b/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch index ce83ed21c..93c4073ce 100644 --- a/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch +++ b/samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch @@ -15,13 +15,14 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> drivers/platform/x86/samsung-laptop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) + diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c -index d1f030053176..98f61f677627 100644 +index 5a5966512277..0d7954e0fc74 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c -@@ -1534,6 +1534,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { +@@ -1568,6 +1568,16 @@ static struct dmi_system_id __initdata samsung_dmi_table[] = { }, - .driver_data = &samsung_broken_acpi_video, + .driver_data = &samsung_np740u3e, }, + { + .callback = samsung_dmi_matched, @@ -36,6 +37,3 @@ index d1f030053176..98f61f677627 100644 { }, }; MODULE_DEVICE_TABLE(dmi, samsung_dmi_table); --- -1.9.0 - @@ -1,3 +1,3 @@ 97ca1625bb40368dc41b9a7971549071 linux-3.15.tar.xz ef8f4db937f521a7e323ec589536ba25 perf-man-3.15.tar.gz -0d37a626ea537e4d4ddc5cc27dc7971b patch-3.15-git6.xz +e563261c495f01f49d16fb9036068316 patch-3.15-git7.xz diff --git a/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch b/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch deleted file mode 100644 index 9f82b7d66..000000000 --- a/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch +++ /dev/null @@ -1,45 +0,0 @@ -Bugzilla: N/A -Upstream-status: Sent for 3.16 - -From a02f11f85e2cb2e0aced78913ebcf060d6055203 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Mon, 2 Jun 2014 17:40:58 +0200 -Subject: [PATCH 01/14] thinkpad_acpi: Add mappings for F9 - F12 hotkeys on - X240 / T440 / T540 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The T440s user guide says that when Fn-lock is not active, the *40s' F9 - F12 -keys should be mapped to: control-panel, search, show-all-windows and Computer. - -These keys generate the sofar unused 28 - 31 hotkey scancodes. - -For the first 2 this nicely matches the icons on the keys, for the latter 2 -the icons are somewhat creative, which is why I ended up looking them up in -the user manual. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - drivers/platform/x86/thinkpad_acpi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c -index 15e61c16736e..d82f196e3cfe 100644 ---- a/drivers/platform/x86/thinkpad_acpi.c -+++ b/drivers/platform/x86/thinkpad_acpi.c -@@ -3171,8 +3171,10 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) - KEY_MICMUTE, /* 0x1a: Mic mute (since ?400 or so) */ - - /* (assignments unknown, please report if found) */ -- KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, - KEY_UNKNOWN, -+ -+ /* Extra keys in use since the X240 / T440 / T540 */ -+ KEY_CONFIG, KEY_SEARCH, KEY_SCALE, KEY_COMPUTER, - }, - }; - --- -1.9.0 - |