From patchwork Wed Nov 14 15:25:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10682761 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 D756514BA for ; Wed, 14 Nov 2018 15:26:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F432BA89 for ; Wed, 14 Nov 2018 15:26:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD8212BA8D; Wed, 14 Nov 2018 15:26:13 +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 0C3682BA89 for ; Wed, 14 Nov 2018 15:26:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387487AbeKOB3v (ORCPT ); Wed, 14 Nov 2018 20:29:51 -0500 Received: from mail-yb1-f195.google.com ([209.85.219.195]:46583 "EHLO mail-yb1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733221AbeKOB3u (ORCPT ); Wed, 14 Nov 2018 20:29:50 -0500 Received: by mail-yb1-f195.google.com with SMTP id i17-v6so7005089ybp.13; Wed, 14 Nov 2018 07:26:09 -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:mime-version :content-transfer-encoding; bh=1Z31lrupEdvDSDibWiaU2UIGrtc5Gf+yzGrBtCGAlFg=; b=o5uFSVmsatbF7pNi+/6vRpbDiyJo5QksjEVicAH72YUjohqJb7ZfssV2vLsdSpMMdH xcE86pF3aEK+LlpU9SgPUYm7Dja9gKPKmboWklj+LkXoGnGt0sCG4dk4oQHYHHRVi0U1 7bzofZdAqdLR9v2KGqV5dLB4+G/Tbj75cQqlL6KnN9bJqQj7AdlILzHEyZqdl6zJ8ksT WslEKYMstwdAKJxjHxJm6xdJ68P9ph+yfkIZLjFEiT/ferIMLYKZJTzRwcM1c4OxXUPM 6P6nZhIdElJFTDehZ01VuoG7ycFl5DllZzb3I/3roP9J2rSv8/yGtAIH4D6mcxJ0gdbN fIqQ== 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:mime-version:content-transfer-encoding; bh=1Z31lrupEdvDSDibWiaU2UIGrtc5Gf+yzGrBtCGAlFg=; b=KNxEpGPETLT6xVMXrRweu6gm+VqOJ6agj3ilYGC/pjvdSsq0o7tqyRyzVT4i1F4/Rj PHd+kucp6AOVfoQ2HrZ+8YvG93Ix2Qy7riDQ5BeygH3abrPjqB8GNIFaIlP9iRf3gXq9 D7f2I68/C0+H3hawOoq0YPFLzkTfnYZdvkqSIPbz268QcLP89ybTv468EDjnl0to+B9L b7mcK4N35LjxlQp7m+1Jg6d/Fzg8KQOYXWMteavz8iN5uTyx0HRkdYDDLNtvnhp1csoc PQNVfM2EwqzcjvpKw0jDmtE+iNWYIIrimscINwQPmASTEqGpDVcn+TBDbJpNUH0doOTf 561w== X-Gm-Message-State: AGRZ1gL8QzXzg1/wl3dKSF44kvJp7n9kuCLDSvop2ytiui6SoqaRyR/J iC7T9ZYeV4Z+YfOU7N//pYtp6sNyLg== X-Google-Smtp-Source: AJdET5esSf0ToLZ0BTJsgw9O+WwMtdAq41LTlcq/9UZiUZ5icAcnSKhTkwyC6YVPtijM1QLaSVwtgg== X-Received: by 2002:a25:2d68:: with SMTP id s40-v6mr2048672ybe.471.1542209168623; Wed, 14 Nov 2018 07:26:08 -0800 (PST) Received: from 960.armstrong.edu ([130.254.104.55]) by smtp.gmail.com with ESMTPSA id b196-v6sm11573815ywh.108.2018.11.14.07.26.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 07:26:08 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Ayman Bagabas , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH v6 1/3] x86: add support for Huawei WMI hotkeys. Date: Wed, 14 Nov 2018 10:25:56 -0500 Message-Id: <20181114152602.7842-2-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114152602.7842-1-ayman.bagabas@gmail.com> References: <20181114152602.7842-1-ayman.bagabas@gmail.com> MIME-Version: 1.0 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 | 10 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/huawei-wmi.c | 215 +++++++++++++++++++ include/linux/platform_data/x86/huawei-wmi.h | 9 + 4 files changed, 235 insertions(+) create mode 100644 drivers/platform/x86/huawei-wmi.c create mode 100644 include/linux/platform_data/x86/huawei-wmi.h diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 54f6a40c75c6..5bdc4d54cddf 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1288,6 +1288,19 @@ config INTEL_ATOMISP2_PM To compile this driver as a module, choose M here: the module will be called intel_atomisp2_pm. +config HUAWEI_WMI + tristate "Huawei WMI hotkeys driver" + 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. + + To compile this driver as a module, choose M here: the module + will be called huawei-wmi. + 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_WMI) += 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..940c07ce4552 --- /dev/null +++ b/drivers/platform/x86/huawei-wmi.c @@ -0,0 +1,214 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Huawei WMI hotkeys + * + * Copyright (C) 2018 Ayman Bagabas + */ + +#include +#include +#include +#include +#include + +MODULE_AUTHOR("Ayman Bagabas "); +MODULE_DESCRIPTION("Huawei WMI hotkeys"); +MODULE_LICENSE("GPL v2"); + +/* + * 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; + char *method; + union acpi_object args[3]; + struct acpi_object_list arg_list = { + .pointer = args, + .count = ARRAY_SIZE(args), + }; + + handle = ACPI_HANDLE(&inputdev->dev); + args[0].type = args[1].type = args[2].type = ACPI_TYPE_INTEGER; + args[1].integer.value = 0x04; + + 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 { + dev_err(&inputdev->dev, "Unable to find ACPI method\n"); + return -ENOSYS; + } + + 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[1]; + struct acpi_object_list arg_list = { + .pointer = args, + .count = ARRAY_SIZE(args), + }; + + args[0].type = ACPI_TYPE_INTEGER; + args[0].integer.value = 0; + + 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 input_dev *inputdev = context; + struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj; + acpi_status status; + + 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) +{ + 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("Compatible WMI GUID not found\n"); + return -ENODEV; + } + + return huawei_wmi_input_init(); +} + +static void __exit huawei_wmi_exit(void) +{ + huawei_wmi_input_exit(); +} + +module_init(huawei_wmi_init); +module_exit(huawei_wmi_exit); 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_WMI) +#ifndef __HUAWEI_WMI_H__ +#define __HUAWEI_WMI_H__ + +int huawei_wmi_micmute_led_set(bool on); + +#endif +#endif From patchwork Wed Nov 14 15:25:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10682763 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 367F9109C for ; Wed, 14 Nov 2018 15:26:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 27E492BA89 for ; Wed, 14 Nov 2018 15:26:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 186CC2BA8C; Wed, 14 Nov 2018 15:26:22 +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 ADFD52BA89 for ; Wed, 14 Nov 2018 15:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732924AbeKOB34 (ORCPT ); Wed, 14 Nov 2018 20:29:56 -0500 Received: from mail-yw1-f65.google.com ([209.85.161.65]:40253 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733043AbeKOB3z (ORCPT ); Wed, 14 Nov 2018 20:29:55 -0500 Received: by mail-yw1-f65.google.com with SMTP id l66-v6so7397372ywl.7; Wed, 14 Nov 2018 07:26:14 -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:mime-version :content-transfer-encoding; bh=Bcr7lyndkj+LTlWwjyiGVd6urWg2+++qn3+nHR4jm/o=; b=tG0wxIJMvPEo2bvS16K9zvKL8HOr6pT+8TU7g/AqnLRYuXkygHqwAJQiiCgHzHkMkh 67xodh4NRpov8zl4NDuR8UOCvd2SYXAATP29MMaR6ZNVoKkbm8TtrmuVl78TqPzgKTFa Yb5DUk7GGUzPZWRsn/9V6Vmx99fyoCXNw2Q8jFIpxwPkNNwYqelkVkzTGsqIaUVRcVXE r4olVRWvILkBeWpJkK/QhxrJAYJRdrd2/Bhwo5727tIpem/6KFrvrQG6TnVCYw+up/Db TqrJYkG0t/unKHpDHWbUwaKorGWT7ZjGI+RooDFzXJ06vTV6UiWq7oIsU8XbmG1fxJ2+ skuA== 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:mime-version:content-transfer-encoding; bh=Bcr7lyndkj+LTlWwjyiGVd6urWg2+++qn3+nHR4jm/o=; b=nGIi6EI1SlOXE1ZyLxmHAvVOA8MJ/63w2Da16qR29n1w+2Om+5kuoQoL+vCWSwMMJB kOqpUbRgOAJ46U5Sxwn3LkKbaGSLuCx5jtuZiJ/b0mFEZF2GzmQ2WDtThjhZxdzAokV3 ZHXjZbIGWBr6UDRAhrDC7mGNIwDSj8leTjYeImzAV+h2ZahyJV68lXJc04I0rjNIsAPY FB0S94zoVVkxc3Wa4eqUIiQ5InJrHs69isiOJdUCfl7id0SjOrHiJVXSzluAiKQ0Mf5l dgew1pOrfSymQuXhjjTpgKia/yMkg82nuNpofCbOlBKy0nibhRU4oXVQauQoTxIm1EKz +nTA== X-Gm-Message-State: AGRZ1gLE+1xThLMYtx2adA4NW1hH23UkC63IfrKWYMMHox6gaKG7uJUK bZSkR1oUMjH8KIJDk+EoKQ== X-Google-Smtp-Source: AJdET5csFpBdSjGiiC+Mod4QaakCFQ+hD+rTDNJnPgVHfKpqnpvINwQyGFT8/YLBU1BNZvc2G+2Qug== X-Received: by 2002:a81:7bc1:: with SMTP id w184-v6mr1950574ywc.345.1542209174079; Wed, 14 Nov 2018 07:26:14 -0800 (PST) Received: from 960.armstrong.edu ([130.254.104.55]) by smtp.gmail.com with ESMTPSA id b196-v6sm11573815ywh.108.2018.11.14.07.26.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 07:26:13 -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 v6 2/3] ALSA: hda: fix front speakers on Huawei MBXP. Date: Wed, 14 Nov 2018 10:25:57 -0500 Message-Id: <20181114152602.7842-3-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114152602.7842-1-ayman.bagabas@gmail.com> References: <20181114152602.7842-1-ayman.bagabas@gmail.com> MIME-Version: 1.0 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 Reviewed-by: Takashi Iwai --- 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..135c0826859b 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, @@ -6594,6 +6611,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), 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(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ #if 0 From patchwork Wed Nov 14 15:25:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10682765 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 55AED14BA for ; Wed, 14 Nov 2018 15:26:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47FF82BA89 for ; Wed, 14 Nov 2018 15:26:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BA7A2BA8C; Wed, 14 Nov 2018 15:26:25 +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 342222BA89 for ; Wed, 14 Nov 2018 15:26:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733072AbeKOBaE (ORCPT ); Wed, 14 Nov 2018 20:30:04 -0500 Received: from mail-yb1-f194.google.com ([209.85.219.194]:33754 "EHLO mail-yb1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733043AbeKOBaE (ORCPT ); Wed, 14 Nov 2018 20:30:04 -0500 Received: by mail-yb1-f194.google.com with SMTP id i78-v6so7054913ybg.0; Wed, 14 Nov 2018 07:26:22 -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:mime-version :content-transfer-encoding; bh=/J/J2yQlCB6JfpYHRJOvL8C31SV3iVfRTBQjfb8JZ1o=; b=R9g1bDws1xbyaZeZSU5gZ+Ck5+LLlpFndMW4FVNisOXVUqji+8bVGp/uh33qYQXg+3 LQnaj3dbz1zUNXKBvgnchP0YHLPZMtMx6q1SPLDg43uTMDW9b/pU3ISMgVICjbxYlTPC IXW+Gjr0zYAI9RwVSXRxR8HVjoIH3xcTBb60lY+jY71CrxdLTISQElxyLD+Ii8NVyn/l 8ROxXfuSvZrgDOyDLITyeCk4Ki6OG8P1GhVEC9dtexn3SPZQ2mH2ksgPGHvkIQpucXZX 1bkJ6lMaPDIagJVp19w/q8bKi3GGulpRPHjJsVBYzjRG7LGa7IMfcEw9yxhnowTF/SB0 agHw== 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:mime-version:content-transfer-encoding; bh=/J/J2yQlCB6JfpYHRJOvL8C31SV3iVfRTBQjfb8JZ1o=; b=k2mcT/CtEsA1sR3JYh+TcjcfCvmHqlhYTwbvXJG1yHjbp8FjFAtA6SQgEfcTQn4iWL VytI8dmDIghnOVlaCAPcBVEYH0zwexGGV3yL6LBJtiU/Yz9GWgAfK+t5WfeCcVoZG1OF 9Y2K/tb/bKGgl9d3I+pNpSyyg9V2i8fU9LAPFyuYs3yocxtd6S/VfmJKUSwqU1N3O1EJ Wb8XzXllFP1uOqC85AVR9jstpLE+74E5PGyUuHe5y60W9TsuSOpVMlHqufhfDc1C7ljF nciO2er+JWDPxdrgWg0Xip02sjNTPKzx8Q4R879RKjWQWyYxJ3zcDEGHzE8VBD/Z5dKh Fo0g== X-Gm-Message-State: AGRZ1gJvgKrQ4ZZptPL4vTdpU2NWKDRZP3myLABXNjxxJ4A89zbtasi2 llOB1r19QQEvMOyvUFh27Q== X-Google-Smtp-Source: AJdET5emXeHgj/Gbl4NlG8yVzmVKchL5CQkmsTkR8C6Xfro3JRbODZUppL+G9XaHdCaG2PS/Hb0jGw== X-Received: by 2002:a25:6a45:: with SMTP id f66-v6mr1944165ybc.155.1542209182091; Wed, 14 Nov 2018 07:26:22 -0800 (PST) Received: from 960.armstrong.edu ([130.254.104.55]) by smtp.gmail.com with ESMTPSA id b196-v6sm11573815ywh.108.2018.11.14.07.26.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Nov 2018 07:26:21 -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 v6 3/3] ALSA: hda: add support for Huawei WMI micmute LED Date: Wed, 14 Nov 2018 10:25:58 -0500 Message-Id: <20181114152602.7842-4-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114152602.7842-1-ayman.bagabas@gmail.com> References: <20181114152602.7842-1-ayman.bagabas@gmail.com> MIME-Version: 1.0 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 the use of micmute LED for these devices: 1. Matebook X (19e5:3200), (19e5:3201) 2. Matebook X Pro (19e5:3204) Signed-off-by: Ayman Bagabas Reviewed-by: Takashi Iwai --- sound/pci/hda/huawei_wmi_helper.c | 47 +++++++++++++++++++++++++++++++ sound/pci/hda/patch_realtek.c | 14 ++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 sound/pci/hda/huawei_wmi_helper.c 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_WMI) +#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 135c0826859b..5431dee40f4f 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_wmi */ +#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, @@ -6611,6 +6621,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), 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(0x19e5, 0x3200, "Huawei MBX", ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED), + SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC256_FIXUP_HUAWEI_WMI_MICMUTE_LED), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */