From patchwork Fri Nov 9 23:45:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10677537 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 AC84914E2 for ; Sun, 11 Nov 2018 09:08:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9281F2B097 for ; Sun, 11 Nov 2018 09:08:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85D6F2B09E; Sun, 11 Nov 2018 09:08:06 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B5952B097 for ; Sun, 11 Nov 2018 09:08:04 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3D6672677E4; Sun, 11 Nov 2018 10:08:03 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id E0A96267B27; Sat, 10 Nov 2018 00:45:50 +0100 (CET) Received: from mail-vs1-f66.google.com (mail-vs1-f66.google.com [209.85.217.66]) by alsa0.perex.cz (Postfix) with ESMTP id 9088C267AB4 for ; Sat, 10 Nov 2018 00:45:48 +0100 (CET) Received: by mail-vs1-f66.google.com with SMTP id h18so2048533vsj.4 for ; Fri, 09 Nov 2018 15:45:48 -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=7EQF8aiVp4wCM6g9rpSc/ejfi5n9RkugfYkCozhrrA4=; b=NFf8nQUUw/Z337jkMOUIYf9dpcoa2TEL7t+3snk8MolZ6xTF4+3rb3+Zul7MCjOInv IKKVIP9/SDXP4990dBSkAaHK0vfVyIu1oD52J21vbiXg9kDvADhpfQ4sLzIBdDIwNFZq icqrohpNYnebinb0i+Zc/WGwV6Y9gH4UmqSCjyD8ouKdP/jsVnXwctVu8LD6u4/TpNd3 LMZknDIaSlRwDLSEjPBS8pXTNCnMolnkH97UDuSFumFNngTFZFsbwotFgHvK6N1xZtpF xFIp/kHnBG4bOKnL7Ur64EDUMWENuDgpEmt1TcG/r/0uC2sqMqb82HdUuK51fxWPcSX/ 1V8w== 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=7EQF8aiVp4wCM6g9rpSc/ejfi5n9RkugfYkCozhrrA4=; b=PquIgz+a5K4uCbN2kSW9v6qzNd8x+w/Q2hYaicA/Y4JYO6c2Jfqgd7+7SOjhl9zk/C M94K0SU7Y1ohUaJGhGjLnrU+CwR9KJuhELJxiSygFrix8hmxGhZTZFgZ3nElM62VsDnh aDfnbP6/SvICVBIsO19T56S36xlE3PH9svVE1TAzxnzxbUzReTuaIVGC2AdnTS5pJizJ I9VkMjBEsxohBkAsXWm8FrDDANdMGcmPxo3gocJ10Al3Zbmes+QTfOJRZP8q8JqFLg9+ sbzVh6nVufqNWDsjA0XRA5wS0nTy54LKECaGhYFqMfVJdKrJMw/ggMUWUs7HSF2UOQi/ iZqw== X-Gm-Message-State: AGRZ1gIGjjNpxeEv+Oar2a+FMQXS2gnN2zwArycy7SK+FNZUB2UBTjm0 BfnuCILSg48JAuBFkKZEMA== X-Google-Smtp-Source: AJdET5c2R30MGT4MyN3+rz6s8cuZWb9LGkunYyfMT9rkr1Mw6BTcHd8NjTgGzo8Gq2VipvEjgIE+Xw== X-Received: by 2002:a67:34c4:: with SMTP id m65mr4693258vsi.192.1541807146838; Fri, 09 Nov 2018 15:45:46 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id c71sm2395689vsd.9.2018.11.09.15.45.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Nov 2018 15:45:46 -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 Date: Fri, 9 Nov 2018 18:45:20 -0500 Message-Id: <20181109234526.4280-3-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181109234526.4280-1-ayman.bagabas@gmail.com> References: <20181109234526.4280-1-ayman.bagabas@gmail.com> X-Mailman-Approved-At: Sun, 11 Nov 2018 10:08:01 +0100 Subject: [alsa-devel] [PATCH v4 2/3] ALSA: hda: fix front speakers on Huawei MBXP. X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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..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 Fri Nov 9 23:45:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayman Bagabas X-Patchwork-Id: 10677539 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 35CA517D4 for ; Sun, 11 Nov 2018 09:08:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22F482A82D for ; Sun, 11 Nov 2018 09:08:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16FDE2B098; Sun, 11 Nov 2018 09:08: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=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E7AA2A82D for ; Sun, 11 Nov 2018 09:08:12 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A2F15267937; Sun, 11 Nov 2018 10:08:04 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5ED83267B2B; Sat, 10 Nov 2018 00:45:58 +0100 (CET) Received: from mail-vk1-f193.google.com (mail-vk1-f193.google.com [209.85.221.193]) by alsa0.perex.cz (Postfix) with ESMTP id 75219267B27 for ; Sat, 10 Nov 2018 00:45:56 +0100 (CET) Received: by mail-vk1-f193.google.com with SMTP id v70so807613vkv.7 for ; Fri, 09 Nov 2018 15:45:56 -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=LYvSmhAETFxPgi5qIGtqVjz3X3AlDxnMgfh/bGnPQ94=; b=mIMN0JNQrQgl7K4HQ5+EyNTQyZ8HZ1RSFFpvxvs5ov7V0ah9Gze4GfR5bNQJXd4Pl7 rDmWkw/bApYimZ+MtckL0nKn++yiTZe+FOXWKF4XMCYr+CX1h4FyjzDry4h52eRIEbHe 7fAEYJMNjDkJyPJJcGmbnaec0BKADmZTqWdEp3lzm9Ka8hNogyVaBp4k+tkhhogzrk7g If9zOHVpQu2Yvv3TJaxJq4OJpN6KdmGDJeOfhoNtzmxh/vwGPmbjBecaLCudysWWfdBE uokl2u1shYYjlWDKOivqgWXKgZq9ctJcOdAnVe8lA5cWPvM5oGiFVp03zYTPvEAs9SZR VNVg== 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=LYvSmhAETFxPgi5qIGtqVjz3X3AlDxnMgfh/bGnPQ94=; b=lbbBwkEieBDKUR53+Yb3lUpdXn8e2NT6OjGJv0+d7j8yvW9keMjsLLm8tTM8R+8uNg dTQOlEKm0C/HOFw+8sYgpY2CfQB1OVEuLA9f9SiaPWBW/toZKDobIxomzpKBIpGLJ0J8 lxS691be23oZIcNltdwLIHn6ICwju0cnW3R9FtYBArhaM5+Vv2aX+tp6hIeuNPKSXOZ5 2TtNtbGdXruS86jXOJN0CCMn1/hKyJvONf7pdkNnb/2ix43cd86DrGNjOMBcBxjDt3yQ Dt6TF3BBROi7/LlrC2iuo0YFb1pHqKzBI04FIWdxBP5DMk3dtxa52kAEzqTF3hYU/i07 f9+Q== X-Gm-Message-State: AGRZ1gIc2iixzI3DmWSdcCFHQquSyDWAuCf4NyqhorqPr0YRnbBLulsV OrJ773Pf0J1WJP5AkAZzXQ== X-Google-Smtp-Source: AJdET5fysr5aC6zpZl7l6PC8YrJBcAwXDr8FQddovOp/GEow2THO95+j+Ck7KVkQD6CsoL4NUOdzhA== X-Received: by 2002:a1f:9042:: with SMTP id s63mr4734227vkd.17.1541807155089; Fri, 09 Nov 2018 15:45:55 -0800 (PST) Received: from localhost.localdomain ([2601:902:c200:6512:a50b:fc5d:3604:d966]) by smtp.gmail.com with ESMTPSA id c71sm2395689vsd.9.2018.11.09.15.45.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Nov 2018 15:45:54 -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 Date: Fri, 9 Nov 2018 18:45:21 -0500 Message-Id: <20181109234526.4280-4-ayman.bagabas@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181109234526.4280-1-ayman.bagabas@gmail.com> References: <20181109234526.4280-1-ayman.bagabas@gmail.com> X-Mailman-Approved-At: Sun, 11 Nov 2018 10:08:01 +0100 Subject: [alsa-devel] [PATCH v4 3/3] ALSA: hda: add support for Huawei WMI micmute LED X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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_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 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 */