From patchwork Tue Nov 27 02:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10699599 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 867DF109C for ; Tue, 27 Nov 2018 02:58:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF92D296A8 for ; Tue, 27 Nov 2018 02:58:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF80F2985C; Tue, 27 Nov 2018 02:58: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 761FD296A8 for ; Tue, 27 Nov 2018 02:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728415AbeK0Ny4 (ORCPT ); Tue, 27 Nov 2018 08:54:56 -0500 Received: from mail-ua1-f65.google.com ([209.85.222.65]:37117 "EHLO mail-ua1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727741AbeK0Ny4 (ORCPT ); Tue, 27 Nov 2018 08:54:56 -0500 Received: by mail-ua1-f65.google.com with SMTP id u19so7099940uae.4; Mon, 26 Nov 2018 18:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YfqBTBoEAkmJTQ/OlmKq0JCyyuRpaP8tN2LFSpUqt6M=; b=qkSSTWqVjfFCENPjuepGa/tCL2UHu4PLc1vqlaY3Gc+Bj9yckOUSp8ERmiDTY5tys4 xT0x2FgxwuZiuj4CwQ/1r66GBDLnkawWaHTZjOZibDBfXxLSuR0pGh8El5fyW678jURc MTOenOyPQgTFhWrsc93cyCOrIqMVINqX+xXM3bOQAKZf6kMhC8FKyKc/HKuXqTyGMSgb i8ZS4G0tge9lOo57hKmLR6ii4jJSt4EboBelhXCLK5N4/4HrEnCs7ngsr4qxb7HCqCIW TQQnLOEO1LQUvpAwXIwE9Ncb2G7ko4zMYaEW23CZ5NYQPkAFz3V6TIB2TdPI5jKE67Zl 9j6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YfqBTBoEAkmJTQ/OlmKq0JCyyuRpaP8tN2LFSpUqt6M=; b=O0RwMd55+m03AHRu34OcH+j7c/uTHQTIqvUJLcV8NEOSk0X8jXHya00zaq3E5g/CPw B3xrmZJ5Uhaecc3e5BEJA90hcBYJ9B6woEi8jsl6R1ZIx7RayDC0NTKVZDVj9sRK0NSn 8Yfuh7JgIxWO8lDY7im9aMaOGfQAOOszBFWKzQ5kK/itO3SUNCW+8recgbkz1eihoBi1 sd/0xT2TWZEiMr4tVg/X/FkDFAvLznwBW/tsHTawp1UtrajqLUM4V4VVDqdaOa6ED4xT 61NVeHVBGORVK9zOtkLj/sgPZQuugFDVCFl9JJeYVL7oxwW+M+iKxOVe/vEn86MwddUC xAdw== X-Gm-Message-State: AA+aEWZEGhn1BarWCI+KoZ1uFmZZ4bW2KzKeZGjTSnaNljATM5f9nxBZ UBato/lcvoUHtObX4FM1ZcIaxw4qFw== X-Google-Smtp-Source: AFSGD/U2UvUCoaFR5kYEf3UyRF/M/sl3BVgC9K/nYK1GgAA7ztMXLg+HEHZ3dCcuD2l8ieSUUSxfpw== X-Received: by 2002:a9f:30cb:: with SMTP id k11mr11808641uab.105.1543287513888; Mon, 26 Nov 2018 18:58:33 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id j82sm1006934vsd.23.2018.11.26.18.58.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 18:58:33 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Cc: ayman.bagabas@gmail.com Subject: [PATCH v7 1/3] ALSA: hda: fix front speakers on Huawei MBXP. Date: Mon, 26 Nov 2018 21:57:47 -0500 Message-Id: <20181127025752.6459-2-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181127025752.6459-1-ayman.bagabas@gmail.com> References: <20181127025752.6459-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 993d34c141c2..1326f32f4574 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5490,6 +5490,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, }; @@ -5761,6 +5762,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, @@ -6591,6 +6608,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 Tue Nov 27 02:57:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10699603 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 8854213BF for ; Tue, 27 Nov 2018 02:58:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 789F22A263 for ; Tue, 27 Nov 2018 02:58:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69C702A275; Tue, 27 Nov 2018 02:58:51 +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 A5F6B2A263 for ; Tue, 27 Nov 2018 02:58:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728234AbeK0NzA (ORCPT ); Tue, 27 Nov 2018 08:55:00 -0500 Received: from mail-vs1-f66.google.com ([209.85.217.66]:37483 "EHLO mail-vs1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727741AbeK0NzA (ORCPT ); Tue, 27 Nov 2018 08:55:00 -0500 Received: by mail-vs1-f66.google.com with SMTP id h18so12817018vsj.4; Mon, 26 Nov 2018 18:58:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s+lnsOoSpKzOe0OGNePqW8hMjyow6Cx41d/JN1fD5LA=; b=b0M6yxsUm1rHQ/qEAmI+u40zl2CUwgLOeSSUS/ricMThCDdtBA8lviBmHYn4GUb0BG ydiMHZfREMuDfTgSzjbVd0ALWSXLQtOI+x4adxaBlTYVo8IdpvQfOMsLKkdr4ogdYSfL pWT7MP/G66kgHfUKYT0q63s2+MaKTQsb276p+4Tsgr4pic/cObDOPW+vNHkckYEl1pf5 IFMT5KnV/XFnCJcsp9prjZt5NewBWSpznyBRAqfeegYxiY7SXcaejq6DGS0gdWZoodJG P11G38YTU+ew2VRE2U9rL7Vulj3Ffskt3AmCcDiagxYduBHTeP4z7s5v+yc+D7QHwz9+ BeZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s+lnsOoSpKzOe0OGNePqW8hMjyow6Cx41d/JN1fD5LA=; b=mZMSDZDP9BBlcLcRVLxAjncFocPcOocr3bWP2nAKBDIlqpKXRj9sgNbOY+CX+zrNUf C0DgkV1+7u4kXgRSXqMKy/VzINfOB+pmsDvqPZgk3ajjxfTvBC14q4D11h8LakqYiHth 8wAiF8BQ/sc0L/qeuaA8iDXHbI94gjcbSeIlP73AabuZycrE6EZArQAqaOmu29dEam5Y 6+kjPk8ASXuqvcNuSH3dZHUjp7hh/8gVcBlGsOOBiyDA5pBkzPZEvswQWto+BBOS3r9x 6gnYD1ANeCZ7U7v97mK4bkRAuxjAMpxLeDRQQoHL6nLeDTMhS1NCyIzbUH7rOaYiCd5u xhLA== X-Gm-Message-State: AA+aEWaJt0upkp/N/XzNxNC/zLy5YOg+MIHWjenWVqNpad+HCBBL4iev 0JKMV41+xPLQBT4Y+7YLgVmmjQ7d7w== X-Google-Smtp-Source: AJdET5eIpTFP4+e7UtCePdkfXR5qDBSK7bWjClKRsOSNpBHra9orumNP8mtagpHOHzWsW5WYsKqIbw== X-Received: by 2002:a67:6583:: with SMTP id z125mr11882805vsb.135.1543287517903; Mon, 26 Nov 2018 18:58:37 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id j82sm1006934vsd.23.2018.11.26.18.58.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 18:58:37 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Cc: ayman.bagabas@gmail.com Subject: [PATCH v7 2/3] x86: add support for Huawei WMI hotkeys. Date: Mon, 26 Nov 2018 21:57:48 -0500 Message-Id: <20181127025752.6459-3-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181127025752.6459-1-ayman.bagabas@gmail.com> References: <20181127025752.6459-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 | 15 ++ drivers/platform/x86/Makefile | 1 + drivers/platform/x86/huawei-wmi.c | 247 ++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+) create mode 100644 drivers/platform/x86/huawei-wmi.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 87f70e8f4dd0..0f9db4275fb4 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1292,6 +1292,21 @@ 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 + select LEDS_TRIGGERS + select LEDS_TRIGGER_AUDIO + 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..d841c550e3cc 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..b6157c5b7f4a --- /dev/null +++ b/drivers/platform/x86/huawei-wmi.c @@ -0,0 +1,247 @@ +// 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_CONFIG } }, + // 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; + +static 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; +} + +static int micmute_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + int state = brightness != LED_OFF; + int err; + + err = huawei_wmi_micmute_led_set(state); + return err < 0 ? err : 0; +} + +static struct led_classdev micmute_led_cdev = { + .name = "huawei::micmute", + .max_brightness = 1, + .brightness_set_blocking = micmute_led_set, + .default_trigger = "audio-micmute", +}; + +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) +{ + 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("Compatible WMI GUID not found\n"); + return -ENODEV; + } + + err = huawei_wmi_input_init(); + if (err) + goto err_input; + + micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); + err = led_classdev_register(&inputdev->dev, &micmute_led_cdev); + if (err) + goto err_leds; + + return 0; + +err_leds: + huawei_wmi_input_exit(); +err_input: + return err; +} + +static void __exit huawei_wmi_exit(void) +{ + led_classdev_unregister(&micmute_led_cdev); + huawei_wmi_input_exit(); +} + +module_init(huawei_wmi_init); +module_exit(huawei_wmi_exit); From patchwork Tue Nov 27 02:57:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10699601 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 4ADA5109C for ; Tue, 27 Nov 2018 02:58:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A6032A263 for ; Tue, 27 Nov 2018 02:58:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E3962A275; Tue, 27 Nov 2018 02:58:45 +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 C6D102A263 for ; Tue, 27 Nov 2018 02:58:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728458AbeK0NzE (ORCPT ); Tue, 27 Nov 2018 08:55:04 -0500 Received: from mail-vk1-f194.google.com ([209.85.221.194]:45017 "EHLO mail-vk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727741AbeK0NzD (ORCPT ); Tue, 27 Nov 2018 08:55:03 -0500 Received: by mail-vk1-f194.google.com with SMTP id h128so4706754vkg.11; Mon, 26 Nov 2018 18:58:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mCEDsDAx5PMCLS87mnomliQo7+OlS9XDiZToeHzkvd8=; b=NvlcDETU+DWyHXNwBiLHi3OHhcsXabUgFEbnVGVUdeu9F4l/y5KKXbluiz78ycq2Nk gA5NklpaCC7QTzNgPA82r1UkEg4VFEDF1JIMKfMP+IBjFfmIg5ex/6NvY0S0H7Dddszr Gkx6e0zxbgcWnVDV42PhEApBpT0XXK/p71SSkSRf8kP6ud0UmD+a71S0+xEoeIdLoolC L6/XUntY9CRr2phmWQsXlWfaPz3f1OXB34cPPmoroBIQ1CHxXZyFojpPSFaQ+QRP5+Rz dE2pMBzW+rLNTycc3Aa6FCxo3XarEFgb51SxbyciYcqYTIqgKKDd6PklHs/+7/33Pofi Z2dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mCEDsDAx5PMCLS87mnomliQo7+OlS9XDiZToeHzkvd8=; b=PZBQaiT0nC7tsfm9sYctC8mxeM+hg3vVPLWkisFMfxpC1Ki5ZFAedmhcezIiilXqtq BB6pTJHd/W8cyJwRq1xpPYbQK/IKQOFUNwA1lxoI9szh5li2sL4TbwKrI1YuAa8o5gDQ Xant3A/jFpDAkOqWVKV6uXDKirEvHxaIA/PyWzguEGqaaTXI0JcvBX2WVgNXdTJiCFxu JGlE+i8wdPJN1vvqi171IqIEzpHJM/3yWSVCAu6VvZek66pPAKn36XN0SzHa+pa+OG7o U8l3Mjc7bDKincZvOKDJrD8UAX/rUr75tD3hNbSYNywZ4e1FzUettHMSn3CX2WvWl1Wn 3l8A== X-Gm-Message-State: AA+aEWYSdFjvqDXHU6NjxjuMq9met3LWapw0n/BGasmC9T/2491j+ceO kZpcVE4lwjgbTbNEellTgg== X-Google-Smtp-Source: AFSGD/VdBLBPuLViUa96UjMCBUQVzuOBhgi91MUNiQWKVY2T53oUgUzPtotLpWAQQe/n6N9NDk8YoQ== X-Received: by 2002:a1f:6184:: with SMTP id v126mr12308012vkb.69.1543287521706; Mon, 26 Nov 2018 18:58:41 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id j82sm1006934vsd.23.2018.11.26.18.58.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 18:58:41 -0800 (PST) From: Ayman Bagabas To: Darren Hart , Andy Shevchenko , Jaroslav Kysela , Takashi Iwai , Kailang Yang , Hui Wang , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, alsa-devel@alsa-project.org Cc: ayman.bagabas@gmail.com Subject: [PATCH v7 3/3] ALSA: hda: add support for Huawei WMI micmute LED Date: Mon, 26 Nov 2018 21:57:49 -0500 Message-Id: <20181127025752.6459-4-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181127025752.6459-1-ayman.bagabas@gmail.com> References: <20181127025752.6459-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 --- sound/pci/hda/patch_realtek.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1326f32f4574..9766fd249bdf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5776,7 +5776,9 @@ static const struct hda_fixup alc269_fixups[] = { {0x1e, 0x411111f0}, {0x21, 0x04211020}, { } - } + }, + .chained = true, + .chain_id = ALC255_FIXUP_MIC_MUTE_LED }, [ALC269_FIXUP_ASUS_X101_FUNC] = { .type = HDA_FIXUP_FUNC, @@ -6608,6 +6610,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", ALC255_FIXUP_MIC_MUTE_LED), + SND_PCI_QUIRK(0x19e5, 0x3201, "Huawei MBX", ALC255_FIXUP_MIC_MUTE_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 */