From patchwork Sun Nov 11 19:02:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10677761 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 E2DAE13AD for ; Sun, 11 Nov 2018 19:03:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D758A2A133 for ; Sun, 11 Nov 2018 19:03:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB7B62A14A; Sun, 11 Nov 2018 19:03:18 +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 271C12A133 for ; Sun, 11 Nov 2018 19:03:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729521AbeKLEwe (ORCPT ); Sun, 11 Nov 2018 23:52:34 -0500 Received: from mail-ua1-f66.google.com ([209.85.222.66]:40675 "EHLO mail-ua1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729405AbeKLEwd (ORCPT ); Sun, 11 Nov 2018 23:52:33 -0500 Received: by mail-ua1-f66.google.com with SMTP id n7so2329454uao.7; Sun, 11 Nov 2018 11:03:13 -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=TCNR4ogDpSPx9vIX7r2dUexjMcSY76iW2pW2cwuhceKIlbExy/P6tvvh2q3VTcs7nm LMd/Ni+ANCAIeCbfJyKZI8S4Ckjlt0XYvoX+2Juv3DwKCy9XeunhqM352fLVIDSiRPWo eep0k4j/CjrAZugdus6APvrmfBK3lZGi8BKaNrBmteeMRUR7xC9CrXj7WEliB+rhjxDA gxKwFcvzbnLqWkAuU5irHbL42+b2UPIoKbim7NzxDqmYOYvJ9lAt2RY+JEK1f0C6/H4I RGV8wodwwH7At+xiv75+IXrhneXeDvP//TUGCsx/krUGJHNqVXZeloV7+kkvM/fhs+8G Xgbg== 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=oOlEVIv980W+XErxqex1ohXEAvPLkIFQkBJf7KMTWUH/uoTHCCXVJKn4T1EHR4Csj2 gxooJrPmXzn9agoJPdQ05snv4zILUQwG56UqMNNeBi7VHLCEuN4WNa1lhhHUu/iqTuJh 7QOb6d7+4dWG/zfrm4gc4AL647jCAAQtuV3TaW3JIY/jKaditfb1urDnUjRsIa9DNDfX v0ulF92BVnEFQE+V0H5dmjBBByy8JzOwzkg10tAYwcYhMnDfR1UzTW1CmeSmDZ6Uywfs 2gJ94cF4u4RwURHgyiVcghU7N2koOasqbL3VfNQpfGWz9WgmMGAWnvU4BYWSqefk3LWi uCxA== X-Gm-Message-State: AGRZ1gKVg4jjqT3368Bry2kbthN/hiW8OQFixuCRp+xmcoQ+XXiWomF7 pyK/ceIIDNMsA/EBdyVNgA== X-Google-Smtp-Source: AJdET5fZQUMjzVbo/FfcN8YMxMWON1xP0mqvkQ5f4jX2Gss9VG+6BiTDIw++0mQ4gmS3ocTJ7mT9UA== X-Received: by 2002:ab0:5484:: with SMTP id p4mr7591584uaa.102.1541962992800; Sun, 11 Nov 2018 11:03:12 -0800 (PST) Received: from localhost.localdomain (c-71-226-66-69.hsd1.ga.comcast.net. [71.226.66.69]) by smtp.gmail.com with ESMTPSA id o8sm4048168vkf.4.2018.11.11.11.03.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Nov 2018 11:03:12 -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 v5 1/3] x86: add support for Huawei WMI hotkeys. Date: Sun, 11 Nov 2018 14:02:43 -0500 Message-Id: <20181111190250.6055-2-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111190250.6055-1-ayman.bagabas@gmail.com> References: <20181111190250.6055-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 Sun Nov 11 19:02:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10677763 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 0B37713AD for ; Sun, 11 Nov 2018 19:03:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF86D2A133 for ; Sun, 11 Nov 2018 19:03:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE94C2A14A; Sun, 11 Nov 2018 19:03:26 +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 81FF72A133 for ; Sun, 11 Nov 2018 19:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729428AbeKLEwj (ORCPT ); Sun, 11 Nov 2018 23:52:39 -0500 Received: from mail-vs1-f68.google.com ([209.85.217.68]:44267 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729405AbeKLEwj (ORCPT ); Sun, 11 Nov 2018 23:52:39 -0500 Received: by mail-vs1-f68.google.com with SMTP id g68so3873569vsd.11; Sun, 11 Nov 2018 11:03:18 -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=7EQF8aiVp4wCM6g9rpSc/ejfi5n9RkugfYkCozhrrA4=; b=rwsYmS2XIPfEJ91jANC0bZpLHs4s8BL/tvgqmIcQsoY+2OrTav7bnlwHBMhdbCpAX0 GFu3+haiTl7K3ArWhXynbIyWy9+qgbnZqTVPJp9TWX9pnjCgnPmu/P9HA47uenMaF4mV mGpi64lO/1JG0adsRgnyz8VaDoaoigHpQ7wTAEEYCfsT0qtLXttplr0ppRUPjNDP/lq7 QiEe3tYbfvi2czVHotUJHDTyb7kgwueiPx5urZM9ja8a5WpO2ZMFdro1YlYHJvOdUw8e 5+iPZgSNbly+qOgkqyuwUSz0lA93kBV/vBtOy9fcYDha7EmgMvY57nTRI8nbp9XLJ/Uz Kp5Q== 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=7EQF8aiVp4wCM6g9rpSc/ejfi5n9RkugfYkCozhrrA4=; b=oneNvNa0aDunMaCZKiaSckqlzopqUVAF6+yHsZSZw8rYdxc/Wga84GIgv61RsI7CHI X6jcsEbsungAWMpKKYlA+d9fTET6dvffZRJPAMra55FfqvG+iIR0bda7dfhISzFzL2F2 DaZpP12jTE1GJZhrINDAwmcmd79aahqiGN4kGW7Ul54RtsZ/gIBKLtDqRVMtaJ86bTF+ gSxYf7Ls1qcnFsJrxfJDfuWkN1/zOahsVwg97wn8Xd/BE4kgrYz/JfLCdE8hsvK1AF8i duBAWZsDfmj2JReuwsXWQWzdhCGA/inoqdQOXj3xWU97Ve3rcRtC5ipcQRAUvjuZSCcS smlg== X-Gm-Message-State: AGRZ1gKhlKlsuUDm8Edgp3P2rRB5bSiTJd42wlVu8cZIsemJv7e2DOqi WdhXStFbBNMq+88orvKAyQ== X-Google-Smtp-Source: AJdET5ds1bS7Rto4k6U4lXPO46+dDiix9FXxGT1OsC2yJ8H4NA6Sp7WobipKkUcRrkjHN7Vu32tgJQ== X-Received: by 2002:a67:6849:: with SMTP id d70mr7163460vsc.199.1541962998187; Sun, 11 Nov 2018 11:03:18 -0800 (PST) Received: from localhost.localdomain (c-71-226-66-69.hsd1.ga.comcast.net. [71.226.66.69]) by smtp.gmail.com with ESMTPSA id o8sm4048168vkf.4.2018.11.11.11.03.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Nov 2018 11:03:17 -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 v5 2/3] ALSA: hda: fix front speakers on Huawei MBXP. Date: Sun, 11 Nov 2018 14:02:44 -0500 Message-Id: <20181111190250.6055-3-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111190250.6055-1-ayman.bagabas@gmail.com> References: <20181111190250.6055-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 Sun Nov 11 19:02:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10677765 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 B6ED613AD for ; Sun, 11 Nov 2018 19:03:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8FC323B34 for ; Sun, 11 Nov 2018 19:03:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C11B25F3E; Sun, 11 Nov 2018 19:03:32 +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 216CC23B34 for ; Sun, 11 Nov 2018 19:03:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729548AbeKLEwq (ORCPT ); Sun, 11 Nov 2018 23:52:46 -0500 Received: from mail-vs1-f65.google.com ([209.85.217.65]:41409 "EHLO mail-vs1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729405AbeKLEwq (ORCPT ); Sun, 11 Nov 2018 23:52:46 -0500 Received: by mail-vs1-f65.google.com with SMTP id t17so3888535vsc.8; Sun, 11 Nov 2018 11:03:26 -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=bCjBgoEwdnE37lqANwcPf/HC9dWDTu0FhS4Rcwc+15E=; b=P1JFtftb82J2Yp+6oLb8ORE12L5IkGwZVrv93HXO1yswiktkk1ge5i7RMw7rpu/2X6 SsCYyKtwZ9ekXAIePcO9vWuaG7x/guxtD/0Ri3R6tf7eAiRuPnuw01JWjPtki4IE+C9j JxebJ6LaksxsmUubQ0w9C+7Mcd7tQ81mws87XhJr9JR/9AiRCa1DY7rGiWfVH/ZZj+KS LzwjaPf1u13sT1sl/qglU0EAVPn76+/T+C0S5ZofR7uAtDnK1VDU7e0ybW+LZu5Cq/iE CWJwjpyfJ1XlpAOdizTM+bX9awCC8xAEmzlUS1khgAnn4kE5zxHe7w+Die6ToV94COdo 8sHQ== 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=bCjBgoEwdnE37lqANwcPf/HC9dWDTu0FhS4Rcwc+15E=; b=HD1ZMl+I24D9ochMvp+ZjbE/8VbGHuQJ58mJiyhDO7OMNE6duKflCCu3UhXJ/YyEkZ 7Ruzw+rzzP+rli3bBQnpDHDe31mYnpnPb4ekF5wx/Wld+TMlKXvmNrhRpZ9uS0QAOMfY tZaSN7KS5l/J3MJtHEk2XWchGANB+3aWAFF3jpQc96QLCCH/WxhOl/urrha9xx6Rwqx/ 05gZ9ERXjM0OXk5wjV+x+dstVz/eJZdHZ/ykW0JJw8uWNW9vY5nqCFvS0jmChiSNe0wa SCUfYlvg4weZ64TMLdtnXlwxhkiN3JKZgBzsGaAL2I2gug/jKgldnFbesw4MnrJkNvZ+ SnRw== X-Gm-Message-State: AGRZ1gI2dYyi82ulKzpx5uv6D9McuE138fRfnGA399G8VURmrHhOWGJs wFaqW4vyM9NuoLYsmrLsIQ== X-Google-Smtp-Source: AJdET5c0TaiudMIntOfUxtgLp8NkVgNov1e4KTplZ15LRbgadh3rGnsj/FK0OWAIrk0ZV+V7ZUudbw== X-Received: by 2002:a67:4b0f:: with SMTP id y15mr7085472vsa.50.1541963005299; Sun, 11 Nov 2018 11:03:25 -0800 (PST) Received: from localhost.localdomain (c-71-226-66-69.hsd1.ga.comcast.net. [71.226.66.69]) by smtp.gmail.com with ESMTPSA id o8sm4048168vkf.4.2018.11.11.11.03.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Nov 2018 11:03:24 -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 v5 3/3] ALSA: hda: add support for Huawei WMI micmute LED Date: Sun, 11 Nov 2018 14:02:45 -0500 Message-Id: <20181111190250.6055-4-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111190250.6055-1-ayman.bagabas@gmail.com> References: <20181111190250.6055-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 and disable this LED accordingly. This enables micmute LED for: 1. Matebook X (19e5:3200), (19e5:3201) 2. Matebook X Pro (19e5:3204) Signed-off-by: Ayman Bagabas --- 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_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, @@ -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 */