From patchwork Fri Nov 6 22:26:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7573811 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7D4E39F1C4 for ; Fri, 6 Nov 2015 22:28:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83B54206B6 for ; Fri, 6 Nov 2015 22:28:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E4DB20696 for ; Fri, 6 Nov 2015 22:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030351AbbKFW10 (ORCPT ); Fri, 6 Nov 2015 17:27:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:58906 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030298AbbKFW1Z (ORCPT ); Fri, 6 Nov 2015 17:27:25 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0LhNVA-1aGwrc3esK-00mb3f; Fri, 06 Nov 2015 23:27:00 +0100 From: Arnd Bergmann To: platform-driver-x86@vger.kernel.org Cc: Ike Panhc , Darren Hart , linux-kernel@vger.kernel.org Subject: [PATCH] ideapad-laptop: include Yoga 3 1170 in add rfkill whitelist Date: Fri, 06 Nov 2015 23:26:59 +0100 Message-ID: <4760270.MzzySUYc0g@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <3945339.hkrnUBKIiS@wuerfel> References: <3945339.hkrnUBKIiS@wuerfel> MIME-Version: 1.0 X-Provags-ID: V03:K0:esoJVB6mW6C/986CClBtnFrOXgNCvnAa/U6UlkIiSywz8qTnGrH HGzSOtPRWWTTgoi3rS789TCnC/cTHOK3ostFK18edO+gyociInx9hGa87CQEoG+hhC2uRw8 f3zBt/MuhPjo3x/CBBs7VWaI2fZgo7fG9ilxJdlIValDbhY7kVXs7uKa6o8pMBGurlyCY5f 8VYUqS3uekvBEl4Ruarug== X-UI-Out-Filterresults: notjunk:1; V01:K0:Uwq8fP/fsnY=:aYg8Wmd80HW0YbsFLcI+3l 8QNBU1eC0ASWc7L1Lrzs43EdxfUo11fu79buLAA4kWPMaT5uc3eRLFGzKGCk2i8YbfJMxMWCe DX2TSPFi84CSCOk5XEyiDKEVj5iWU0b0dm6rwPz5tkYYcAsSM3gKQCdKlOMCUJ8UU+atqJXwL JgvfsXCw1LWjVcobpMSbvpWmeW71WfS9i0ygetaMdlZJiMXD1pVYGumKtVNr6TqRfgosr8/r1 aEHhS5aBABUuQnjMzf9be0lzuiq633wrDO4IA2OMKqPXzfaGwtu0NFEylGman0bWRq5/V+1gU hlR2Y0DcTBGjzWbeglWFue+P3HCIsC7LmtKAhBDFLkKPHeV6IB+7ISUGfMchizSlKrRQrJT4H KT4J1ATK7n9WxzqOuMmP94dyyl/AFVMJ+ZGXG3iU75hCz319jIgZaNfMcZlQBHgyWhoXGFfYu 5QRvrPViyzX7YY7lrrwE2Yfcmqj0ILil3cCPBtv1Lj4rTgFW+ObEVtIyUvzvXgMw48BVdTNYW CdzfJOMGHculslYO7CutYAiWYKC+weh72qMEleMPKTO3uWpj//3jTJAOvncN/0T4krUUEQmMK pW9XVcvVOrMzhOj69Ky7+rAeNcHyxhc5q7QplYDuF+2TO7uvepGUiiFJRMVMAVSy4/pV6zK5X e33ytzGbhyOWRmoEW9xWOS83P76FjT5faEt+HqGHhTsF5eGcRZwWcUjVe5+cAMjpFbV9HXrMy iCEFUbt0+/M/Elkz Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This changes the entry to the whitelist of machines that do not have a physical rfkill switch. Unfortunately, the Yoga 3 generation seems to use upper-case letters for the YOGA 3 Pro-1370, while it uses normal capitalization for its Yoga 3 1170 and 1470 siblings. In order to catch all variants of the Yoga 3, I'm changing both the entry for the 1470 (using "Yoga" as the name) and the entry for the Pro 1370 (using all-caps "YOGA") to not match the exact model number but only the generation. This way, the 1170 and 1470 models share one entry, but if the firmware changes from one format to the other, it will still work. The second entry for Yoga 2 Pro that was recently added for some reason ended up not being added in alphanumeric order, and I'm moving the Yoga 3 1470 entry down while making the change, so they are sorted more logically. Signed-off-by: Arnd Bergmann --- I realized that this patch didn't make it in when I sent it back in may. I have adapted it to the changes that happened since. -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index db76d011bedd..c11f40f37bd0 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -872,24 +872,24 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { }, }, { - .ident = "Lenovo Yoga 3 14", + .ident = "Lenovo Yoga 2 11 / 13 / Pro", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3 14"), + DMI_MATCH(DMI_BOARD_NAME, "Yoga2"), }, }, { - .ident = "Lenovo Yoga 2 11 / 13 / Pro", + .ident = "Lenovo Yoga 3 1170 / 1470", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_BOARD_NAME, "Yoga2"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3"), }, }, { .ident = "Lenovo Yoga 3 Pro 1370", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3 Pro-1370"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3"), }, }, {}