summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-28 14:18:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-28 14:18:25 -0400
commitf61587053c7ec3f4671a17bbbe3d6bfb3c9a8ecb (patch)
treed5d82144a2697f5837c5d304947bdf1f8372eb97
parentc6207348dfef098226d946a179061f0ba0fdcf7d (diff)
downloadkernel-f61587053c7ec3f4671a17bbbe3d6bfb3c9a8ecb.tar.gz
kernel-f61587053c7ec3f4671a17bbbe3d6bfb3c9a8ecb.tar.xz
kernel-f61587053c7ec3f4671a17bbbe3d6bfb3c9a8ecb.zip
Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)
-rw-r--r--kernel.spec9
-rw-r--r--quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch33
2 files changed, 42 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index f5a45f24d..f654259e0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -623,6 +623,9 @@ Patch26059: i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
Patch26060: rcu-More-on-deadlock-between-CPU-hotplug-and-expedit.patch
Patch26061: rcu-Make-rcu_barrier-understand-about-missing-rcuo-k.patch
+#rhbz 1157327
+Patch26062: quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1355,6 +1358,9 @@ ApplyPatch i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
ApplyPatch rcu-More-on-deadlock-between-CPU-hotplug-and-expedit.patch
ApplyPatch rcu-Make-rcu_barrier-understand-about-missing-rcuo-k.patch
+#rhbz 1157327
+ApplyPatch quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2223,6 +2229,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Oct 28 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Add quirk for rfkill on Yoga 3 machines (rhbz 1157327)
+
* Tue Oct 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git1.1
- Linux v3.18-rc2-43-gf7e87a44ef60
- Add two RCU patches to fix a deadlock and a hang
diff --git a/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch b/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
new file mode 100644
index 000000000..3d517414b
--- /dev/null
+++ b/quirk-for-Lenovo-Yoga-3-no-rfkill-switch.patch
@@ -0,0 +1,33 @@
+From: Stephan Mueller <smueller@chronox.de>
+Date: Mon, 27 Oct 2014 04:09:50 +0100
+Subject: [PATCH] quirk for Lenovo Yoga 3: no rfkill switch
+
+The Yoga 3 does not contain any physical rfkill switch. Therefore
+disable the rfkill switch identically to the Yoga 2 approach.
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+---
+ drivers/platform/x86/ideapad-laptop.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
+index 02152de135b5..ed494f37c40f 100644
+--- a/drivers/platform/x86/ideapad-laptop.c
++++ b/drivers/platform/x86/ideapad-laptop.c
+@@ -837,6 +837,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = {
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
+ },
+ },
++ {
++ .ident = "Lenovo Yoga 3 Pro 1370",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3 Pro-1370"),
++ },
++ },
+ {}
+ };
+
+--
+1.9.3
+