From patchwork Thu Nov 8 17:16:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10674721 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE45814BD for ; Thu, 8 Nov 2018 17:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B31C72DA26 for ; Thu, 8 Nov 2018 17:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A69592DA64; Thu, 8 Nov 2018 17:17:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFD3D2DA26 for ; Thu, 8 Nov 2018 17:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726845AbeKICx5 (ORCPT ); Thu, 8 Nov 2018 21:53:57 -0500 Received: from mail-vs1-f67.google.com ([209.85.217.67]:43239 "EHLO mail-vs1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726585AbeKICx5 (ORCPT ); Thu, 8 Nov 2018 21:53:57 -0500 Received: by mail-vs1-f67.google.com with SMTP id x1so5699971vsc.10; Thu, 08 Nov 2018 09:17:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=XERwZdq20iB5eit7K7ANBmcTZZ79b7jDtewPhWUJx78=; b=kmGtHGuQ8xl9BuPazvPVwxY1J/PL9hbQKcoNBjZNt6zCu5kUKKD4naBno4QBslhNDr 55yzgTdC4HwOSWxrdwLMU+ARLBq5e9GnazSzcBoG5xkm6hKdHqbVXt+Jph55cL4wL+2c 8bFQc5ajG6uzpOhWXv84C9EJEzOFqgAGY9TGxM8SZHbcPPAz+cmTMA1CCGwJyi7oPd4P tc7JnNZvEBCKFcPGGbfgJy8TcF6RBEUam/0hQawg83LNEl7jewpRm68M0Gas5K23Yzk2 gewqc9W9zKOO60UANJ43CTCTbpLH+vD6+mWgBdpkzVK0XAQBSiSwB1wXgb3QdLyLLiEx U1zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XERwZdq20iB5eit7K7ANBmcTZZ79b7jDtewPhWUJx78=; b=oBQqiX7EGXD10xLFxHUQj3HXUnRsChAkUOu6oiRwH/FFbRUPSEI/xFm/pfGBhcbm32 ytoiKUXuatf3dXpek6wRanztHIuTXXIeTo0D8P/HH+iT4QtMVMS7zPQIZx+nF8K68iEz OncVfBTiIWyMOUxx+6YpgLnHNxnHrfPw92ab29yXDNxWaE0g6JDOwyAOu/MbOgOAqVwE ilsPT1JVZ4XsOatme102IqDDEF4uSPy3wjcUO3sg/dYEg1PZSbqyqsBHWPnTvEu0Fn6c bIrCtWdH/dt20xxOTflclJVHpCcmTfKRQXa6WX1DBtGqlGfzbKUBC/86q4q9tXhD4ZMn Rpsw== X-Gm-Message-State: AGRZ1gKePT9SNhaUsHVipsO0HN1YZx9hSOFpXeR4Sgr5cS1szA5E9Ioa 2OCyJtM6EvUItyg2ekp6mw== X-Google-Smtp-Source: AJdET5feQ52KxZvH6FTrTC3u4z9Lcg+tlElIp2vwxoxfLYoJbjkRQ0ZwZXf35d3howWGDJ9v8Pd2YA== X-Received: by 2002:a67:b34b:: with SMTP id b11mr2451547vsm.28.1541697448095; Thu, 08 Nov 2018 09:17:28 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id y195sm1792776vkd.0.2018.11.08.09.17.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:17:27 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Ayman Bagabas , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 1/3] x86: add support for Huawei WMI hotkeys. Date: Thu, 8 Nov 2018 12:16:53 -0500 Message-Id: <20181108171701.4444-2-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181108171701.4444-1-ayman.bagabas@gmail.com> References: <20181108171701.4444-1-ayman.bagabas@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver adds support for missing hotkeys on some Huawei laptops. Currently, only Huawei Matebook X and Matebook X Pro is supported. Signed-off-by: Ayman Bagabas --- drivers/platform/x86/Kconfig | 11 ++ drivers/platform/x86/Makefile | 1 + drivers/platform/x86/huawei_wmi.c | 235 ++++++++++++++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 drivers/platform/x86/huawei_wmi.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 54f6a40c75c6..b45c1294df7e 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1288,6 +1288,17 @@ config INTEL_ATOMISP2_PM To compile this driver as a module, choose M here: the module will be called intel_atomisp2_pm. +config HUAWEI_LAPTOP + tristate "Huawei WMI hotkeys driver" + depends on ACPI + depends on ACPI_WMI + depends on INPUT + select INPUT_SPARSEKMAP + help + This driver provides support for Huawei WMI hotkeys. + It enables the missing keys and adds support to the micmute + LED found on some of these laptops. + endif # X86_PLATFORM_DEVICES config PMC_ATOM diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 39ae94135406..ee93655d8bc1 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_ACERHDF) += acerhdf.o obj-$(CONFIG_HP_ACCEL) += hp_accel.o obj-$(CONFIG_HP_WIRELESS) += hp-wireless.o obj-$(CONFIG_HP_WMI) += hp-wmi.o +obj-$(CONFIG_HUAWEI_LAPTOP) += huawei_wmi.o obj-$(CONFIG_AMILO_RFKILL) += amilo-rfkill.o obj-$(CONFIG_GPD_POCKET_FAN) += gpd-pocket-fan.o obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o diff --git a/drivers/platform/x86/huawei_wmi.c b/drivers/platform/x86/huawei_wmi.c new file mode 100644 index 000000000000..658c44ab2126 --- /dev/null +++ b/drivers/platform/x86/huawei_wmi.c @@ -0,0 +1,235 @@ +/* + * Huawei WMI hotkeys + * + * Copyright (C) 2018 Ayman Bagabas + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include +#include + +MODULE_AUTHOR("Ayman Bagabas "); +MODULE_DESCRIPTION("Huawei WMI hotkeys"); +MODULE_LICENSE("GPL"); + +/* + * Huawei WMI Events GUIDs + */ +#define MBX_EVENT_GUID "59142400-C6A3-40fa-BADB-8A2652834100" +#define MBXP_EVENT_GUID "ABBC0F5C-8EA1-11D1-A000-C90629100000" + +MODULE_ALIAS("wmi:"MBX_EVENT_GUID); +MODULE_ALIAS("wmi:"MBXP_EVENT_GUID); + +static const struct key_entry huawei_wmi_keymap[] __initconst = { + { KE_KEY, 0x281, { KEY_BRIGHTNESSDOWN } }, + { KE_KEY, 0x282, { KEY_BRIGHTNESSUP } }, + { KE_KEY, 0x284, { KEY_MUTE } }, + { KE_KEY, 0x285, { KEY_VOLUMEDOWN } }, + { KE_KEY, 0x286, { KEY_VOLUMEUP } }, + { KE_KEY, 0x287, { KEY_MICMUTE } }, + { KE_KEY, 0x289, { KEY_WLAN } }, + // Huawei |M| button + { KE_KEY, 0x28a, { KEY_PROG1 } }, + // Keyboard light + { KE_IGNORE, 0x293, { KEY_KBDILLUMTOGGLE } }, + { KE_IGNORE, 0x294, { KEY_KBDILLUMUP } }, + { KE_IGNORE, 0x295, { KEY_KBDILLUMUP } }, + { KE_END, 0 } +}; + +static char *event_guid; +static struct input_dev *inputdev; + +int huawei_wmi_micmute_led_set(bool on) +{ + acpi_handle handle = ACPI_HANDLE(&inputdev->dev); + char *method; + union acpi_object args[3]; + args[0].type = args[1].type = args[2].type = ACPI_TYPE_INTEGER; + args[1].integer.value = 0x04; + struct acpi_object_list arg_list = { + .pointer = args, + .count = ARRAY_SIZE(args), + }; + + if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.SPIN")) { + args[0].integer.value = 0; + args[2].integer.value = on ? 1 : 0; + } else if (acpi_has_method(handle, method = "\\_SB.PCI0.LPCB.EC0.WPIN")) { + args[0].integer.value = 1; + args[2].integer.value = on ? 0 : 1; + } else { + pr_err("Unable to find ACPI method\n"); + return -1; + } + + acpi_evaluate_object(handle, method, &arg_list, NULL); + + return 0; +} +EXPORT_SYMBOL_GPL(huawei_wmi_micmute_led_set); + +static void huawei_wmi_process_key(struct input_dev *inputdev, int code) +{ + const struct key_entry *key; + + /* + * MBX uses code 0x80 to indicate a hotkey event. + * The actual key is fetched from the method WQ00 + */ + if (code == 0x80) { + acpi_status status; + unsigned long long result; + const char *method = "\\WMI0.WQ00"; + union acpi_object args[] = { + { .type = ACPI_TYPE_INTEGER }, + }; + args[0].integer.value = 0; + struct acpi_object_list arg_list = { + .pointer = args, + .count = ARRAY_SIZE(args), + }; + + status = acpi_evaluate_integer(ACPI_HANDLE(&inputdev->dev), (char *)method, &arg_list, &result); + if (ACPI_FAILURE(status)) { + dev_err(&inputdev->dev, "Unable to evaluate ACPI method %s\n", method); + return; + } + + code = result; + } + + key = sparse_keymap_entry_from_scancode(inputdev, code); + if (!key) { + dev_info(&inputdev->dev, "Unknown key pressed, code: 0x%04x\n", code); + return; + } + + /* + * The MBXP handles backlight natively using ACPI, + * but not the MBX. If MBXP is being used, skip reporting event. + */ + if ((key->sw.code == KEY_BRIGHTNESSUP + || key->sw.code == KEY_BRIGHTNESSDOWN) + && strcmp(event_guid, MBXP_EVENT_GUID) == 0) + return; + + sparse_keymap_report_entry(inputdev, key, 1, true); +} + +static void huawei_wmi_notify(u32 value, void *context) +{ + struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj; + acpi_status status; + struct input_dev *inputdev = (struct input_dev*)context; + + status = wmi_get_event_data(value, &response); + if (ACPI_FAILURE(status)) { + dev_err(&inputdev->dev, "Bad event status 0x%x\n", status); + return; + } + + obj = (union acpi_object *)response.pointer; + if (!obj) + return; + + if (obj->type == ACPI_TYPE_INTEGER) + huawei_wmi_process_key(inputdev, obj->integer.value); + else + dev_info(&inputdev->dev, "Unknown response received %d\n", obj->type); + + kfree(response.pointer); +} + +static int huawei_wmi_input_init(void) +{ + acpi_status status; + int err; + + inputdev = input_allocate_device(); + if (!inputdev) + return -ENOMEM; + + inputdev->name = "Huawei WMI hotkeys"; + inputdev->phys = "wmi/input0"; + inputdev->id.bustype = BUS_HOST; + + err = sparse_keymap_setup(inputdev, + huawei_wmi_keymap, NULL); + if (err) + goto err_free_dev; + + status = wmi_install_notify_handler(event_guid, + huawei_wmi_notify, + inputdev); + if (ACPI_FAILURE(status)) { + err = -EIO; + goto err_free_dev; + } + + err = input_register_device(inputdev); + if (err) + goto err_remove_notifier; + + return 0; + +err_remove_notifier: + wmi_remove_notify_handler(event_guid); +err_free_dev: + input_free_device(inputdev); + return err; +} + +static void huawei_wmi_input_exit(void) +{ + wmi_remove_notify_handler(event_guid); + input_unregister_device(inputdev); +} + +static int __init huawei_wmi_init(void) +{ + int err; + + if (wmi_has_guid(MBX_EVENT_GUID)) { + event_guid = MBX_EVENT_GUID; + } else if (wmi_has_guid(MBXP_EVENT_GUID)) { + event_guid = MBXP_EVENT_GUID; + } else { + pr_warn("No known WMI GUID found\n"); + return -ENODEV; + } + + err = huawei_wmi_input_init(); + if (err) { + pr_err("Failed to setup input device\n"); + return err; + } + + return 0; +} + +static void __exit huawei_wmi_exit(void) +{ + huawei_wmi_input_exit(); +} + +module_init(huawei_wmi_init); +module_exit(huawei_wmi_exit); From patchwork Thu Nov 8 17:16:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10674723 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73FCE14BD for ; Thu, 8 Nov 2018 17:17:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A1E12DA26 for ; Thu, 8 Nov 2018 17:17:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DFF92DA64; Thu, 8 Nov 2018 17:17:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E67DD2DA26 for ; Thu, 8 Nov 2018 17:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727246AbeKICyD (ORCPT ); Thu, 8 Nov 2018 21:54:03 -0500 Received: from mail-vs1-f68.google.com ([209.85.217.68]:33062 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726585AbeKICyD (ORCPT ); Thu, 8 Nov 2018 21:54:03 -0500 Received: by mail-vs1-f68.google.com with SMTP id p74so12059727vsc.0; Thu, 08 Nov 2018 09:17:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=AMw79WFDGo/up7GIOLU1VAUkcjaGvL1OiVLYSaic0QQ=; b=NNJBhSMiyvjH6JqapwYt5yJ5wO09MqHjO4QfASzKLfh6e3Q9ap5tPcH4uNbDyreze8 acCq0pcFO47yN3PxwRCcZDHuxhYrFFpPl4/Tbh8cjk/x2UnscxZwgmXSnJYOVENy0Ive BgGIAWuFxSi111Pdw5t3AQ1N+FhF8DkYMA37I7RTMMCXJW56jjb2J8xUaZ3ue92aNRk7 PaJ4V0uPLiNLxj/sOUZ1QiKbBftGusYt+i2QkXWC8k+PHgvdvwCxyHS/oyf4Q4r0iWhz uaKxSGyM1wW7GLjgalCeW8+eJtq1hFs5xrCs5hnZhBG7C80UkrMESHO/ZStLrhok2Ozu JaNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AMw79WFDGo/up7GIOLU1VAUkcjaGvL1OiVLYSaic0QQ=; b=kXw8UkTCkAobVHY9cWkpEHWqRUsoOZJzC6T7udzeyVq/KM7wJXfHyDI9tuOfDFH3eu exP0FN3QmI7YY9GmmNqsYIU4rJdhQehEpb1JQbDQT6cWYd21Gi7Ixq+a7WvZYNgW53ih xfwGj9eHkwXlutGKVwm9vwSV9RhRuEvlT/cbh/Mzb6rCbBfj1fOz3nRZld7YlQEAxyOW E0WlqCParJVlCwvMBmkQeIWbycoWAjFUepmiUVmAvzdF77tWOegxrQ4UyNK2dBBT3ko5 7Hxk9LSdmk9/oIkpB/ha7EK4HST4VwAiHUG8IAL1YDKA6lZR7R2iQ/0gSoPW/6Vz4Vk/ n3cQ== X-Gm-Message-State: AGRZ1gLLkA6sZ4B6e2d+IBg76ryW2CTvMAePC8cNWvLn54s66GAWbcSV NiJJJ4HOQ7yuq4kpiUmKxw== X-Google-Smtp-Source: AJdET5eMD/qZYzGYWDImLpF/phzPQ9le0wYT6R3nRO1YiFQM9RGd704kLymliXkQDWW7EufFr1D7NA== X-Received: by 2002:a67:c29c:: with SMTP id k28mr2360321vsj.130.1541697454935; Thu, 08 Nov 2018 09:17:34 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id y195sm1792776vkd.0.2018.11.08.09.17.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:17:34 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Ayman Bagabas , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 2/3] ALSA: hda: fix front speakers on Huawei MBXP. Date: Thu, 8 Nov 2018 12:16:54 -0500 Message-Id: <20181108171701.4444-3-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181108171701.4444-1-ayman.bagabas@gmail.com> References: <20181108171701.4444-1-ayman.bagabas@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch solves bug 200501 'Only 2 of 4 speakers playing sound.' https://bugzilla.kernel.org/show_bug.cgi?id=200501 It enables the front speakers on Huawei Matebook X Pro laptops. These laptops come with Dolby Atmos sound system and these pins configuration enables the front speakers. Signed-off-by: Ayman Bagabas --- sound/pci/hda/patch_realtek.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index fa61674a5605..ed6c9c79ce46 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5493,6 +5493,7 @@ enum { ALC298_FIXUP_TPT470_DOCK, ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, + ALC256_FIXUP_HUAWEI_MBXP_PINS, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, }; @@ -5764,6 +5765,22 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC256_FIXUP_HUAWEI_MBXP_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + {0x12, 0x90a60130}, + {0x13, 0x40000000}, + {0x14, 0x90170110}, + {0x18, 0x411111f0}, + {0x19, 0x04a11040}, + {0x1a, 0x411111f0}, + {0x1b, 0x90170112}, + {0x1d, 0x40759a05}, + {0x1e, 0x411111f0}, + {0x21, 0x04211020}, + { } + } + }, [ALC269_FIXUP_ASUS_X101_FUNC] = { .type = HDA_FIXUP_FUNC, .v.func = alc269_fixup_x101_headset_mic, @@ -6592,6 +6609,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), + SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ From patchwork Thu Nov 8 17:16:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10674725 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D54841709 for ; Thu, 8 Nov 2018 17:17:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB8BB2DA0A for ; Thu, 8 Nov 2018 17:17:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF7FB2DA63; Thu, 8 Nov 2018 17:17:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60E532DA0A for ; Thu, 8 Nov 2018 17:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726710AbeKICyP (ORCPT ); Thu, 8 Nov 2018 21:54:15 -0500 Received: from mail-ua1-f66.google.com ([209.85.222.66]:40044 "EHLO mail-ua1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726585AbeKICyP (ORCPT ); Thu, 8 Nov 2018 21:54:15 -0500 Received: by mail-ua1-f66.google.com with SMTP id n7so7472604uao.7; Thu, 08 Nov 2018 09:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=h0+0KTJsu6PVSeFp8yzXYmba/nQ5Vz0KUhLkno1pcPY=; b=MHJooLJQM9wviND3/4scHjWVhq6cN4hWGfJdhMSfKSZq9syulxH52eF77Hv8HrmXZ1 mpIwnxV7BRAONeVR9RT01lXAiQ3rHaHiVjnlWNCDKFUKs0LziOkMuY+71/fCPGtJEvbP rB3RII8kyGtGTVuEcRBopM75JQwIMlGpZtySVXfDbsGohQD5wcgBFpNbHUgJW+ZhHU2o m8KrGS8EfYE9mjD9slOcoeMqu7Yj2jYOuaMX0sO9ASiZ4NM5a9VKVakjL4bvPkoN6Bzs 6UEu3HNbcP7OCk6HnwP7eDmS9/rh0ct5YWMYrtqalobPZK2HOGB2qZqEFci2ERZBsyYG Yu2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=h0+0KTJsu6PVSeFp8yzXYmba/nQ5Vz0KUhLkno1pcPY=; b=Knm4MyAev6yrsm+G2cw5hb4YXs22Q/1Fa3AQbQ2yNF5CBdNIg0xewI07PNyp8tgPBa GhKlsEBrESb/B0g+REv3zqQ2IfpS+GkeUOsEcTADPnmcDGkepeFxC+4jr9BDNVxSIcRk X2NQ3ZSDxd4FOlmWtHVqvOygtNBG74D7fx+LF2w1bixAvpANrh6Ky9cXKCNtUsoMfYBn i64++Yviag6AjKnpwPL6yaOeMmkVUFM3L1kl14IlKUwCO0/Hux8DUATujVjrAmaTzMIU lE+VhcrWiVDqn8WjtE9XS5flSEm5RivyVspWyMy+70J9ZiKNX9GLs+a0eD+rRzTUhayZ VLNw== X-Gm-Message-State: AGRZ1gKEn/RoBbmsVTbUUI6QV7VJLXZrU36WRKPKuC+jfMbKBA+d9txq lNpxL8F1E9OwvvbEjpCAuA== X-Google-Smtp-Source: AJdET5cBA8713ve5bnYHHnoeqxI9J5YWAGaRLlzTc86gWYvPhPglkuzZ6OwW2/1UFa/vvsIVybYt+Q== X-Received: by 2002:ab0:498a:: with SMTP id e10mr2544323uad.134.1541697465907; Thu, 08 Nov 2018 09:17:45 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id y195sm1792776vkd.0.2018.11.08.09.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:17:45 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Ayman Bagabas , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 3/3] ALSA: hda: add support for Huawei WMI micmute LED Date: Thu, 8 Nov 2018 12:16:55 -0500 Message-Id: <20181108171701.4444-4-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181108171701.4444-1-ayman.bagabas@gmail.com> References: <20181108171701.4444-1-ayman.bagabas@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some of Huawei laptops come with a LED in the micmute key. This patch enables and disable this LED accordingly. Signed-off-by: Ayman Bagabas Signed-off-by: Pavel Machek --- drivers/platform/x86/huawei_wmi.c | 1 + include/linux/platform_data/x86/huawei_wmi.h | 9 ++++ sound/pci/hda/huawei_wmi_helper.c | 47 ++++++++++++++++++++ sound/pci/hda/patch_realtek.c | 13 +++++- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 include/linux/platform_data/x86/huawei_wmi.h create mode 100644 sound/pci/hda/huawei_wmi_helper.c diff --git a/drivers/platform/x86/huawei_wmi.c b/drivers/platform/x86/huawei_wmi.c index 658c44ab2126..f06aa967c311 100644 --- a/drivers/platform/x86/huawei_wmi.c +++ b/drivers/platform/x86/huawei_wmi.c @@ -23,6 +23,7 @@ #include #include #include +#include MODULE_AUTHOR("Ayman Bagabas "); MODULE_DESCRIPTION("Huawei WMI hotkeys"); diff --git a/include/linux/platform_data/x86/huawei_wmi.h b/include/linux/platform_data/x86/huawei_wmi.h new file mode 100644 index 000000000000..dd251780ee5c --- /dev/null +++ b/include/linux/platform_data/x86/huawei_wmi.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if IS_ENABLED(CONFIG_HUAWEI_LAPTOP) +#ifndef __HUAWEI_WMI_H__ +#define __HUAWEI_WMI_H__ + +int huawei_wmi_micmute_led_set(bool on); + +#endif +#endif diff --git a/sound/pci/hda/huawei_wmi_helper.c b/sound/pci/hda/huawei_wmi_helper.c new file mode 100644 index 000000000000..7c91f914ffba --- /dev/null +++ b/sound/pci/hda/huawei_wmi_helper.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Helper functions for Huawei WMI micmute LED; + * to be included from codec driver + */ + +#if IS_ENABLED(CONFIG_HUAWEI_LAPTOP) +#include + +static int (*huawei_wmi_micmute_led_set_func)(bool); + +static void update_huawei_wmi_micmute_led(struct hda_codec *codec) +{ + struct hda_gen_spec *spec = codec->spec; + huawei_wmi_micmute_led_set_func(spec->micmute_led.led_value); +} + +static void alc_fixup_huawei_wmi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + bool removefunc = false; + + if (action == HDA_FIXUP_ACT_PROBE) { + if (!huawei_wmi_micmute_led_set_func) + huawei_wmi_micmute_led_set_func = symbol_request(huawei_wmi_micmute_led_set); + if (!huawei_wmi_micmute_led_set_func) { + codec_warn(codec, "Failed to find huawei_wmi symbol huawei_wmi_micmute_led_set\n"); + return; + } + + removefunc = (huawei_wmi_micmute_led_set_func(false) < 0) + || (snd_hda_gen_add_micmute_led(codec, update_huawei_wmi_micmute_led) < 0); + } + + if (huawei_wmi_micmute_led_set_func && (action == HDA_FIXUP_ACT_FREE || removefunc)) { + symbol_put(huawei_wmi_micmute_led_set); + huawei_wmi_micmute_led_set_func = NULL; + } +} + +#else + +static void alc_fixup_huawei_wmi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ +} + +#endif diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ed6c9c79ce46..a0fdcfb0b635 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5374,6 +5374,9 @@ static void alc_fixup_thinkpad_acpi(struct hda_codec *codec, /* for alc295_fixup_hp_top_speakers */ #include "hp_x360_helper.c" +/* for alc_fixup_huawei_micmute_led */ +#include "huawei_wmi_helper.c" + enum { ALC269_FIXUP_SONY_VAIO, ALC275_FIXUP_SONY_VAIO_GPIO2, @@ -5494,6 +5497,7 @@ enum { ALC255_FIXUP_DUMMY_LINEOUT_VERB, ALC255_FIXUP_DELL_HEADSET_MIC, ALC256_FIXUP_HUAWEI_MBXP_PINS, + ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED, ALC295_FIXUP_HP_X360, ALC221_FIXUP_HP_HEADSET_MIC, }; @@ -5765,6 +5769,10 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MIC }, + [ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_huawei_wmi + }, [ALC256_FIXUP_HUAWEI_MBXP_PINS] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -5779,7 +5787,9 @@ static const struct hda_fixup alc269_fixups[] = { {0x1e, 0x411111f0}, {0x21, 0x04211020}, { } - } + }, + .chained = true, + .chain_id = ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED }, [ALC269_FIXUP_ASUS_X101_FUNC] = { .type = HDA_FIXUP_FUNC, @@ -6609,6 +6619,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x17aa, 0x511e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), + SND_PCI_QUIRK(0x19e5, 0x3200, "Huawei MBX", ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),