From patchwork Wed Apr 6 06:13:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1613751 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=sWzg2qYT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYDk31xG9z9sFv for ; Wed, 6 Apr 2022 16:14:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbyvf-0004wa-9J; Wed, 06 Apr 2022 06:14:07 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbyve-0004wH-9j for kernel-team@lists.ubuntu.com; Wed, 06 Apr 2022 06:14:06 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 06D0F3F7F8 for ; Wed, 6 Apr 2022 06:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649225646; bh=L4twgzK1nZclDkNuO8b3y9ClAZymASpdJZXsj1ozDGM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sWzg2qYTEV5spGSyJQPLXNqFU46X2v+Ed6VxaCkycUJO90B901iMTdliGVdzj++5Z gNrQX0I1hNexWFvRBmYMHW3NCo/csfMpwxtERQOT6Ok8xFw15HfX3aJ37/DDWkkiaO bC2Jq4aNemkfaPC0r8yuR4/TOlEi/Bw3w+3v2p5MEegUgldUaY9oTW58CI1HroX8a2 rjSbw/DlfekGmuzNNXTbnDYdFpTg1f2eIcg3Nxv23ctI13RIBGDvOlF2qg8+qSz8ak GcpRqD4IYy3MxcqUG8rn5OAl52KTwqJgtZAaClrkVlAaccZ7n+dJ4kVioVqH7pQEIP vHBKVqqCYbO/g== Received: by mail-pj1-f71.google.com with SMTP id oo16-20020a17090b1c9000b001c6d21e8c04so3172931pjb.4 for ; Tue, 05 Apr 2022 23:14:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4twgzK1nZclDkNuO8b3y9ClAZymASpdJZXsj1ozDGM=; b=YSoR0O05x9+9Av9FkeCrimuT8QL86KwFL1gyHddyr8kbOVqEcn4wL0wCBU6NdunJGE jMT5ZHKKJW13v8p4xK/CTNKFdwO0hSnvvNSkC1Rd4DLOmGrGsSTkMQhe/BnduFiV86Xf NshOy9aLSo0vGIjtz9qVtkliA+kqDhMl0+UxyGcmZH2soqoVgTRiIq5Oql4ZY0G7RLnL RFtxJDWGTHGXbyeHeFh60VP37MJQlc9gdYjG86hquUoQboSKFq8T8TI96N3T+ANb43EX V5ua1c1zBjLyZQ702A9XmjzG9GGD3yW0vBmy3gprZ7w4Sme17K0ts2/wbiwJN57ZDimy JsMw== X-Gm-Message-State: AOAM53084RQF2Zxpmxcgi41C3tkdPMadahAVIN/5rgcUEV85BzsMY3mp JPpmSeLqEEaQsgCrByGWP5WZ26RAA+k0+AedtDlvT8rREC2rADEiHC9Up5YAjEuQdlOZmqvfICb TA4032Htmt83A1iqM/N1XDewIUJx/BiuCU3sFAVXrjA== X-Received: by 2002:a63:5564:0:b0:399:1d7c:80a1 with SMTP id f36-20020a635564000000b003991d7c80a1mr5650167pgm.203.1649225644394; Tue, 05 Apr 2022 23:14:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7uI11Vk/wjeub3zWDD/V8IjhwQO/88RHmw2gz4Dn+rsPr+iGzsoPAmTMkPxhb24vpwFt8Og== X-Received: by 2002:a63:5564:0:b0:399:1d7c:80a1 with SMTP id f36-20020a635564000000b003991d7c80a1mr5650156pgm.203.1649225644029; Tue, 05 Apr 2022 23:14:04 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-212-30.dynamic-ip.hinet.net. [59.115.212.30]) by smtp.gmail.com with ESMTPSA id r10-20020a17090a454a00b001c96a912aa0sm4482458pjm.3.2022.04.05.23.14.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:14:03 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][J/U/OEM-5.14][PATCH 1/6] ALSA: hda/cs8409: Fix Warlock to use mono mic configuration Date: Wed, 6 Apr 2022 14:13:47 +0800 Message-Id: <20220406061352.966815-2-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406061352.966815-1-chris.chiu@canonical.com> References: <20220406061352.966815-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Binding BugLink: https://bugs.launchpad.net/bugs/1967988 Warlock/Bullseye Laptops have a mono DMIC, Cyborg uses a stereo DMIC, and the configuration should reflect this. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov Link: https://lore.kernel.org/r/20220328115614.15761-2-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai (cherry picked from commit 8a7724535bacbb94fd9441ec232a83d71006d2a9) Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index aff2b5abb81e..1411e3845f16 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -907,8 +907,8 @@ static void cs8409_cs42l42_hw_init(struct hda_codec *codec) } /* DMIC1_MO=00b, DMIC1/2_SR=1 */ - if (codec->fixup_id == CS8409_WARLOCK || codec->fixup_id == CS8409_CYBORG) - cs8409_vendor_coef_set(codec, 0x09, 0x0003); + if (codec->fixup_id == CS8409_CYBORG) + cs8409_vendor_coef_set(codec, CS8409_DMIC_CFG, 0x0003); cs42l42_resume(cs42l42); From patchwork Wed Apr 6 06:13:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1613749 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Xb1aM8OK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYDk31Ylhz9sFs for ; Wed, 6 Apr 2022 16:14:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbyvj-0004y4-Gg; Wed, 06 Apr 2022 06:14:11 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbyvh-0004x1-FO for kernel-team@lists.ubuntu.com; Wed, 06 Apr 2022 06:14:09 +0000 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 275843F7F8 for ; Wed, 6 Apr 2022 06:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649225649; bh=FbrLbSyS1Nr1rK53nuclUHdU4kQfth1vDrd3bKNILMY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xb1aM8OKqGS+0X2+FKXjW4CZw6CQ7KA2iV49Fyf3ABiqJDcntKII06gvaoDnZLmHh gmpqDWRiZv9PXC+QK+P1Kee8vcjl8zR3LvO30MSo57hRDbj/qgdYEyqD68V3ovd/zz zHCcIKkfOsTUWSlRr4AkossxNrXkb3q3oQUbafsWQDdw8+rZA/uRG0uzOaNlJsQuDZ Dl+VWzQX+h3Mr+ypVVP8mJ4ifalZKkEzrVY3E3+pns1/LzTQywlX1lsFnGSq8gW3H3 cd5T50mXyr1DHb7jyI2y2rYCA0ISPOFr8F9olIobDtGke9dXbQvi5in4Y4NvM7fXEI 7v6JdB7hpWGWw== Received: by mail-pg1-f198.google.com with SMTP id z10-20020a634c0a000000b0036c5eb39076so901269pga.18 for ; Tue, 05 Apr 2022 23:14:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FbrLbSyS1Nr1rK53nuclUHdU4kQfth1vDrd3bKNILMY=; b=qECRrgTZasd84RrSgdljVgTwxSIEMJ2GG3Rc+83tRWGdPqrMBIIulraewD2LcnwlT9 JkqP3hBQr7YG/6KVYrVLYalCuVX1Lyd9eOavkSBEqqk6gyxIG3YZqlXCIT2qii0gp1vF r9ivJOlnq3FCxcRdcmvw9YuihoqPRo2qFUq7aHSw3zm2caoIoP0K7UbyREO7JX3MM7Gl o9ToD4LO6uCtPqaB916CiW6BajncctLl32LIPvT7Kt9Avk+fwKsjrVRd/MbZ62FQKlIP K4Uz8FKerBHLfg3seX7+FAABQ4dbEMaMHaLECBiimrXInW5DPszOGxQZr9ZOdPTw4WVe mSDA== X-Gm-Message-State: AOAM531AXzuW7i+KVkTgaJCo93zRaIv5Cm0S4uhFbl/xHmyzXKTc0hkr mQTH8iH4BQF7t6DEgpPHxRZhQIzVQnWxd/LA3zt+wuKhEbseUz7wGEPZSZ+B5cem7qyXjAgGULF m8Qn/X8Zx3/QOCEFFjRjHdx5LEaNgfbXho+8oE3FU/g== X-Received: by 2002:a05:6a02:283:b0:342:703e:1434 with SMTP id bk3-20020a056a02028300b00342703e1434mr5792601pgb.74.1649225647425; Tue, 05 Apr 2022 23:14:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSUzKGq0Vlmqh7VhK1E1SEIjVRezK2q5rShDhGW76zKNfU0B8L0L1UGyrwr1VD3hnO1ZQSKQ== X-Received: by 2002:a05:6a02:283:b0:342:703e:1434 with SMTP id bk3-20020a056a02028300b00342703e1434mr5792583pgb.74.1649225647027; Tue, 05 Apr 2022 23:14:07 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-212-30.dynamic-ip.hinet.net. [59.115.212.30]) by smtp.gmail.com with ESMTPSA id r10-20020a17090a454a00b001c96a912aa0sm4482458pjm.3.2022.04.05.23.14.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:14:06 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][J/U/OEM-5.14][PATCH 2/6] ALSA: hda/cs8409: Re-order quirk table into ascending order Date: Wed, 6 Apr 2022 14:13:48 +0800 Message-Id: <20220406061352.966815-3-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406061352.966815-1-chris.chiu@canonical.com> References: <20220406061352.966815-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Binding BugLink: https://bugs.launchpad.net/bugs/1967988 To ensure consistency, the quirk table should be re-ordered in ascending order [ a typo fix in the patch description by tiwai ] Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov Link: https://lore.kernel.org/r/20220328115614.15761-3-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai (cherry picked from commit bdc159dfda0acec5ca3adde1a1b58e1e0ddc8311) Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409-tables.c | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/pci/hda/patch_cs8409-tables.c b/sound/pci/hda/patch_cs8409-tables.c index 2d1fa706327b..9c1fa97100ef 100644 --- a/sound/pci/hda/patch_cs8409-tables.c +++ b/sound/pci/hda/patch_cs8409-tables.c @@ -478,28 +478,29 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0A29, "Bullseye", CS8409_BULLSEYE), SND_PCI_QUIRK(0x1028, 0x0A2A, "Bullseye", CS8409_BULLSEYE), SND_PCI_QUIRK(0x1028, 0x0A2B, "Bullseye", CS8409_BULLSEYE), + SND_PCI_QUIRK(0x1028, 0x0A77, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A78, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A79, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A7A, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A7D, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A7E, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A7F, "Cyborg", CS8409_CYBORG), + SND_PCI_QUIRK(0x1028, 0x0A80, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AB0, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AB2, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AB1, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AB3, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AB4, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AB5, "Warlock", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0ACF, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0AD0, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0AD1, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0AD2, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0AD3, "Dolphin", CS8409_DOLPHIN), SND_PCI_QUIRK(0x1028, 0x0AD9, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0ADA, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0ADB, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0ADC, "Warlock", CS8409_WARLOCK), - SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK), - SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK), - SND_PCI_QUIRK(0x1028, 0x0BB5, "Warlock N3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), - SND_PCI_QUIRK(0x1028, 0x0BB6, "Warlock V3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), - SND_PCI_QUIRK(0x1028, 0x0A77, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A78, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A79, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A7A, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A7D, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A7E, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A7F, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0A80, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0ADF, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AE0, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AE1, "Cyborg", CS8409_CYBORG), @@ -512,11 +513,10 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0AEE, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AEF, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AF0, "Cyborg", CS8409_CYBORG), - SND_PCI_QUIRK(0x1028, 0x0AD0, "Dolphin", CS8409_DOLPHIN), - SND_PCI_QUIRK(0x1028, 0x0AD1, "Dolphin", CS8409_DOLPHIN), - SND_PCI_QUIRK(0x1028, 0x0AD2, "Dolphin", CS8409_DOLPHIN), - SND_PCI_QUIRK(0x1028, 0x0AD3, "Dolphin", CS8409_DOLPHIN), - SND_PCI_QUIRK(0x1028, 0x0ACF, "Dolphin", CS8409_DOLPHIN), + SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0BB5, "Warlock N3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0BB6, "Warlock V3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), {} /* terminator */ }; From patchwork Wed Apr 6 06:13:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1613752 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=IDQ5nmzd; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYDk73VMtz9sFr for ; Wed, 6 Apr 2022 16:14:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbyvp-00053r-Pn; Wed, 06 Apr 2022 06:14:17 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbyvn-00051Q-I6 for kernel-team@lists.ubuntu.com; Wed, 06 Apr 2022 06:14:15 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5264E3F7F8 for ; Wed, 6 Apr 2022 06:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649225655; bh=2P4XNgJRlGg/IVnoBSpwlQxLu2y1nv782ewtVCnXL3o=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IDQ5nmzdZwmpKj3gtkSqXriRzrELXBv9zf0zA5bs1R6iFRFGVOp4tvlrMxBy+jfxY 0KcmUbiX+kLNimc7ihyKPZAXxsjAhC9lCmgoQ9o6uWG4C2Y4jhDxAQErHtk5hApxWQ zLGdt0BxFVYw3W9RidTN/DtDkz6TjNejBRNoWOR/9JK3ykJmKkyApMvm8jLZsmIPtY AmKp0tkaPE/Jz3q3Hdag7+Ftwy1BbtiEd2etnMk7V5hg5HJWpj1V0cHtnSTS2j/3xF POQsRrcod2tykE2wFO9HTQdhp+FPWEolFMqtNX4BZlclZcNyjqvEJ4gYLN2b7R/I7i oBu2Gp4Z42Lbw== Received: by mail-pl1-f200.google.com with SMTP id n11-20020a170902d2cb00b00156c1fd01c2so662612plc.12 for ; Tue, 05 Apr 2022 23:14:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2P4XNgJRlGg/IVnoBSpwlQxLu2y1nv782ewtVCnXL3o=; b=wNbZBIDi7cUQZRA5WNCxNwECS0tb7Rmzzt70l2BgPO86t1fueOr8qesyInpIaFNy0P kXTVlrRE9W32m9Ke4yoI13TvGgQ49+kqk0z7i3YQMNr7g+Kwf42OywRbNm5sslcuKEKj BeJqOtucNCpUfrTuMBuWdQjGWzgQmsW8URFpfd0pY3pSEoJjez1yCcGZOgd0Ml+URpyS U4iIGGjCz++AXTzqcMyl70GZTRhvs9K9oZ+YG1LaTQC18jgWPhtnqEflRVznNilmAkF1 BiaqM5DucwBZwdW2J4TDGnLKPUJl2hJBZACALQMyfVOrN/hP+nekkqZ4LJReZwSQiE4N hqoQ== X-Gm-Message-State: AOAM533+jMVi4LqJOyMzenpiFx/h5XYSxRo69OlWqYUq2yIFDiP9X5Ug QINRFpWgu3l/qjOSLCgjsXvjv7PUcqeC6DZ5Sbs6YM7xJDRNNWc4P626nCkYCuzxmqAJstn934v svshaV4ixo0w5zeUi5iXYi0WzjJiSORt2MTt4IyvPCg== X-Received: by 2002:a05:6a00:438b:b0:4fa:a67c:7ca0 with SMTP id bt11-20020a056a00438b00b004faa67c7ca0mr7242343pfb.5.1649225653005; Tue, 05 Apr 2022 23:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7s4wSNdJHd1PtTWQqNmggdbdpbCV2Cm8WPR5ZnzLs9/VT1HOEAB31RioC+FCu7OqzLDRBxA== X-Received: by 2002:a05:6a00:438b:b0:4fa:a67c:7ca0 with SMTP id bt11-20020a056a00438b00b004faa67c7ca0mr7242221pfb.5.1649225651141; Tue, 05 Apr 2022 23:14:11 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-212-30.dynamic-ip.hinet.net. [59.115.212.30]) by smtp.gmail.com with ESMTPSA id r10-20020a17090a454a00b001c96a912aa0sm4482458pjm.3.2022.04.05.23.14.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:14:10 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][J/U/OEM-5.14][PATCH 3/6] ALSA: hda/cs8409: Fix Full Scale Volume setting for all variants Date: Wed, 6 Apr 2022 14:13:49 +0800 Message-Id: <20220406061352.966815-4-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406061352.966815-1-chris.chiu@canonical.com> References: <20220406061352.966815-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Binding BugLink: https://bugs.launchpad.net/bugs/1967988 All current variants (Bullseye/Warlock/Cyborg) should be using reduced volume (-6dB) for better speaker protection. Refactor to make more explicit the meaning and setting of Full Scale Volume setting to avoid future confusion. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov Link: https://lore.kernel.org/r/20220328115614.15761-4-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai (cherry picked from commit 342b6b610ae2a351de904022271e740c4c2b452b) Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409.c | 29 ++++++++++++++++------------- sound/pci/hda/patch_cs8409.h | 3 +++ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 1411e3845f16..163ff3b3092a 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -733,6 +733,7 @@ static void cs42l42_resume(struct sub_codec *cs42l42) { 0x130A, 0x00 }, { 0x130F, 0x00 }, }; + int fsv_old, fsv_new; /* Bring CS42L42 out of Reset */ gpio_data = snd_hda_codec_read(codec, CS8409_PIN_AFG, 0, AC_VERB_GET_GPIO_DATA, 0); @@ -749,8 +750,13 @@ static void cs42l42_resume(struct sub_codec *cs42l42) /* Clear interrupts, by reading interrupt status registers */ cs8409_i2c_bulk_read(cs42l42, irq_regs, ARRAY_SIZE(irq_regs)); - if (cs42l42->full_scale_vol) - cs8409_i2c_write(cs42l42, 0x2001, 0x01); + fsv_old = cs8409_i2c_read(cs42l42, 0x2001); + if (cs42l42->full_scale_vol == CS42L42_FULL_SCALE_VOL_0DB) + fsv_new = fsv_old & ~CS42L42_FULL_SCALE_VOL_MASK; + else + fsv_new = fsv_old & CS42L42_FULL_SCALE_VOL_MASK; + if (fsv_new != fsv_old) + cs8409_i2c_write(cs42l42, 0x2001, fsv_new); /* we have to explicitly allow unsol event handling even during the * resume phase so that the jack event is processed properly @@ -997,21 +1003,15 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, * Additionally set HSBIAS_SENSE_EN and Full Scale volume for some variants. */ switch (codec->fixup_id) { - case CS8409_WARLOCK: - spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020; - spec->scodecs[CS8409_CODEC0]->full_scale_vol = 1; - break; - case CS8409_BULLSEYE: - spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020; - spec->scodecs[CS8409_CODEC0]->full_scale_vol = 0; - break; case CS8409_CYBORG: spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x00a0; - spec->scodecs[CS8409_CODEC0]->full_scale_vol = 1; + spec->scodecs[CS8409_CODEC0]->full_scale_vol = + CS42L42_FULL_SCALE_VOL_MINUS6DB; break; default: - spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0003; - spec->scodecs[CS8409_CODEC0]->full_scale_vol = 1; + spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020; + spec->scodecs[CS8409_CODEC0]->full_scale_vol = + CS42L42_FULL_SCALE_VOL_MINUS6DB; break; } @@ -1222,6 +1222,9 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac cs8409_fix_caps(codec, DOLPHIN_LO_PIN_NID); cs8409_fix_caps(codec, DOLPHIN_AMIC_PIN_NID); + spec->scodecs[CS8409_CODEC0]->full_scale_vol = CS42L42_FULL_SCALE_VOL_MINUS6DB; + spec->scodecs[CS8409_CODEC1]->full_scale_vol = CS42L42_FULL_SCALE_VOL_MINUS6DB; + break; case HDA_FIXUP_ACT_PROBE: /* Fix Sample Rate to 48kHz */ diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index d0b725c7285b..8e846f292cd0 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -235,6 +235,9 @@ enum cs8409_coefficient_index_registers { #define CS42L42_I2C_SLEEP_US (2000) #define CS42L42_PDN_TIMEOUT_US (250000) #define CS42L42_PDN_SLEEP_US (2000) +#define CS42L42_FULL_SCALE_VOL_MASK (2) +#define CS42L42_FULL_SCALE_VOL_0DB (1) +#define CS42L42_FULL_SCALE_VOL_MINUS6DB (0) /* Dell BULLSEYE / WARLOCK / CYBORG Specific Definitions */ From patchwork Wed Apr 6 06:13:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1613753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ljg90E26; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYDkC3r9yz9sFr for ; Wed, 6 Apr 2022 16:14:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbyvu-0005AJ-6e; Wed, 06 Apr 2022 06:14:22 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbyvr-00056Q-LY for kernel-team@lists.ubuntu.com; Wed, 06 Apr 2022 06:14:19 +0000 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 6782E3F7F8 for ; Wed, 6 Apr 2022 06:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649225659; bh=vEGx9cnWHcUJbiZmlREZWerprh8jWpQzW8A+LedKmaA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ljg90E26lN4SB5w3fXSpFMcY0kZpIvKsUxdmZHeAiaMV9uni75wBMP4lvQzOOvopX gXR1RilcMmMTMDFEsW90yOT8nUf95K1NTu4Cr6vo8K4M4vReIpBik1a5lu37tAUDN6 3m/TT32z3b2KtUy/qOSYAkDkL3M7U8NvCSCgWLbVbVcudqQ6RqdFmbYibBqpN6PC8i /JkCE2Kl/EouV46RLZ7Lff7rXXtFKjV0JvgxOtdspfwGHGyIhBB5pm4guek/28EiwW 0wzQOEJbnDw9KD7tQY1ii6IUCDkSXZEGbQjClTRE6QTx42884tdhb8M1H8kN1N1+Yx 90fwKk2Gnk/rg== Received: by mail-pg1-f197.google.com with SMTP id e12-20020a63544c000000b003985d5888a8so905009pgm.15 for ; Tue, 05 Apr 2022 23:14:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vEGx9cnWHcUJbiZmlREZWerprh8jWpQzW8A+LedKmaA=; b=HC0dJJ7On3jgetwQH46HYDfNswhBi0foUlHuy/2G0gODp0oXEeyN7oW05bNMYkdONh afAPrGQNotfrF2MhGOvH92E7uVNisoYVqYdAVXLSvwPh9A2+ELjH3MhP4at1TsKKUief k0HNWdq4XXgr9GFmFolY8XVd9WACJVLVs0mtEV+RBN/k5eTtBswbV8dtSddL8pXZ6m/R +23cMKbhgJzNthCGBQw3gcJoX0x/DASDUOAZRgs8Igy8BWu4TKjr8e/k1MdfoqlOCJMJ uYy+fUUl8eaG3OY1lWDweNUuTjcMfRV1Cz/IpelOquA0j+NlbNyM6d866/hwbF+xXLeL 2e3A== X-Gm-Message-State: AOAM532YoK4Wre56eFyOADyJh9hSM2tmvfvyhq9+0C805k8WjfPJHcwd GxWLqsN92SV98ofqkukouG7Tx/n8BP9mlnRBCYChX7xf4B/AL3KGyAJ0ynMdpHbaD0CEdisyA5/ 4y9W8MJSrojwSqGitkwX5/g2XFRjzadNMehRbOrzHBA== X-Received: by 2002:a17:902:6b4a:b0:156:647c:e25c with SMTP id g10-20020a1709026b4a00b00156647ce25cmr7342942plt.9.1649225657849; Tue, 05 Apr 2022 23:14:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdc9J8kCyYd5KwuTqKEKTS/yIbL+rIPthfIxyQbl86jMuGgaOeALV9mqKNYHdUnJZkZXt1DQ== X-Received: by 2002:a17:902:6b4a:b0:156:647c:e25c with SMTP id g10-20020a1709026b4a00b00156647ce25cmr7342913plt.9.1649225657313; Tue, 05 Apr 2022 23:14:17 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-212-30.dynamic-ip.hinet.net. [59.115.212.30]) by smtp.gmail.com with ESMTPSA id r10-20020a17090a454a00b001c96a912aa0sm4482458pjm.3.2022.04.05.23.14.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:14:17 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][J/U/OEM-5.14][PATCH 4/6] ALSA: hda/cs8409: Support new Warlock MLK Variants Date: Wed, 6 Apr 2022 14:13:50 +0800 Message-Id: <20220406061352.966815-5-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406061352.966815-1-chris.chiu@canonical.com> References: <20220406061352.966815-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Binding BugLink: https://bugs.launchpad.net/bugs/1967988 Added 15 new laptops, with 2 variants: Warlock MLK and Warlock MLK with Dual Mic The only difference between the variants, is the the dual Mic variants use a stereo DMIC. These variants do no use reduce volume (Full Scale Volume) Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov Link: https://lore.kernel.org/r/20220328115614.15761-5-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai (cherry picked from commit 6581a045d54c6a8fe335dd2f343fc7cd2ebfe9e7) Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409-tables.c | 29 +++++++++++++++++++++++++++++ sound/pci/hda/patch_cs8409.c | 15 +++++++++++++-- sound/pci/hda/patch_cs8409.h | 2 ++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_cs8409-tables.c b/sound/pci/hda/patch_cs8409-tables.c index 9c1fa97100ef..8d20d7fb3d68 100644 --- a/sound/pci/hda/patch_cs8409-tables.c +++ b/sound/pci/hda/patch_cs8409-tables.c @@ -515,8 +515,23 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0AF0, "Cyborg", CS8409_CYBORG), SND_PCI_QUIRK(0x1028, 0x0AF4, "Warlock", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0AF5, "Warlock", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0B92, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0B93, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), + SND_PCI_QUIRK(0x1028, 0x0B94, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0B95, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), + SND_PCI_QUIRK(0x1028, 0x0B96, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0B97, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), + SND_PCI_QUIRK(0x1028, 0x0BB2, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0BB3, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0BB4, "Warlock MLK", CS8409_WARLOCK_MLK), SND_PCI_QUIRK(0x1028, 0x0BB5, "Warlock N3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), SND_PCI_QUIRK(0x1028, 0x0BB6, "Warlock V3 15 TGL-U Nuvoton EC", CS8409_WARLOCK), + SND_PCI_QUIRK(0x1028, 0x0BB8, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0BB9, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), + SND_PCI_QUIRK(0x1028, 0x0BBA, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0BBB, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), + SND_PCI_QUIRK(0x1028, 0x0BBC, "Warlock MLK", CS8409_WARLOCK_MLK), + SND_PCI_QUIRK(0x1028, 0x0BBD, "Warlock MLK Dual Mic", CS8409_WARLOCK_MLK_DUAL_MIC), {} /* terminator */ }; @@ -524,6 +539,8 @@ const struct snd_pci_quirk cs8409_fixup_tbl[] = { const struct hda_model_fixup cs8409_models[] = { { .id = CS8409_BULLSEYE, .name = "bullseye" }, { .id = CS8409_WARLOCK, .name = "warlock" }, + { .id = CS8409_WARLOCK_MLK, .name = "warlock mlk" }, + { .id = CS8409_WARLOCK_MLK_DUAL_MIC, .name = "warlock mlk dual mic" }, { .id = CS8409_CYBORG, .name = "cyborg" }, { .id = CS8409_DOLPHIN, .name = "dolphin" }, {} @@ -542,6 +559,18 @@ const struct hda_fixup cs8409_fixups[] = { .chained = true, .chain_id = CS8409_FIXUPS, }, + [CS8409_WARLOCK_MLK] = { + .type = HDA_FIXUP_PINS, + .v.pins = cs8409_cs42l42_pincfgs, + .chained = true, + .chain_id = CS8409_FIXUPS, + }, + [CS8409_WARLOCK_MLK_DUAL_MIC] = { + .type = HDA_FIXUP_PINS, + .v.pins = cs8409_cs42l42_pincfgs, + .chained = true, + .chain_id = CS8409_FIXUPS, + }, [CS8409_CYBORG] = { .type = HDA_FIXUP_PINS, .v.pins = cs8409_cs42l42_pincfgs, diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 163ff3b3092a..ce5fc03a8065 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -912,9 +912,15 @@ static void cs8409_cs42l42_hw_init(struct hda_codec *codec) cs8409_vendor_coef_set(codec, seq_bullseye->cir, seq_bullseye->coeff); } - /* DMIC1_MO=00b, DMIC1/2_SR=1 */ - if (codec->fixup_id == CS8409_CYBORG) + switch (codec->fixup_id) { + case CS8409_CYBORG: + case CS8409_WARLOCK_MLK_DUAL_MIC: + /* DMIC1_MO=00b, DMIC1/2_SR=1 */ cs8409_vendor_coef_set(codec, CS8409_DMIC_CFG, 0x0003); + break; + default: + break; + } cs42l42_resume(cs42l42); @@ -1008,6 +1014,11 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, spec->scodecs[CS8409_CODEC0]->full_scale_vol = CS42L42_FULL_SCALE_VOL_MINUS6DB; break; + case CS8409_WARLOCK_MLK: + case CS8409_WARLOCK_MLK_DUAL_MIC: + spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020; + spec->scodecs[CS8409_CODEC0]->full_scale_vol = CS42L42_FULL_SCALE_VOL_0DB; + break; default: spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020; spec->scodecs[CS8409_CODEC0]->full_scale_vol = diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index 8e846f292cd0..7df46bd8d2da 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -267,6 +267,8 @@ enum cs8409_coefficient_index_registers { enum { CS8409_BULLSEYE, CS8409_WARLOCK, + CS8409_WARLOCK_MLK, + CS8409_WARLOCK_MLK_DUAL_MIC, CS8409_CYBORG, CS8409_FIXUPS, CS8409_DOLPHIN, From patchwork Wed Apr 6 06:13:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1613754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=wRaTnQxt; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYDkG0G6Sz9sFr for ; Wed, 6 Apr 2022 16:14:30 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nbyvw-0005En-Jh; Wed, 06 Apr 2022 06:14:24 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nbyvv-0005Bm-E5 for kernel-team@lists.ubuntu.com; Wed, 06 Apr 2022 06:14:23 +0000 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 337693F7F8 for ; Wed, 6 Apr 2022 06:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1649225663; bh=kNk/lTHcpmXmZPuFk4gm71WNqiXm9m/jG3ME6LyHqzc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wRaTnQxtZB3T5URthDFNlhWa8qxCGXE6WLbwaEmnzUb/Ip4DS9+PQRhIym1mrSCNZ 9rgsoAgxTYFD1L6ZfoByPVutRaDF6C5e6DZcXDBSWq9hiD7+86tnsuyW2pvjBWWqzG MFvx4KNN0TcvG+itwYYQMkrxasr5wN3XRHh55wb2//WVrmRTynDfgSUmNxxTVWYZXU shQ28KB9SIE2YLMPfKflG/C9cdz46aJ4K5xvg7dLCO1z4NfI8o+WkyiM+ReM1KHEM7 gk+LDo8HHI2UUEZae/n/ZIynmYj0NomKOkVrKrNewoAW3D+YmJwtFRYZPXE6jR5mUt Cpi9tsSELkFTA== Received: by mail-pf1-f199.google.com with SMTP id c6-20020a621c06000000b004fa7307e2e0so1012567pfc.6 for ; Tue, 05 Apr 2022 23:14:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kNk/lTHcpmXmZPuFk4gm71WNqiXm9m/jG3ME6LyHqzc=; b=OTMKJAH2XQ6S+CkJTpHHN0ICqV+eiEa5IYsvyxEsz0EREpCb+2eZQCzZiCmbKbn7qW 2q7ZA9F4AEuVLKCS05CnxJUW55u2qw8h3qRKhtmfc7n1ZH8nVLr9H+JANinPdx/hQq3e NIl7MXL4xwCY42saZjhcWxMFfcQxBc4xEERfHkOyNt3TnJZlRUYs+eZSeu7VBOcYbfTe 4e12iF/BIjIVsWrjyCnz02nozXHqLxb56gxo1BhigpvbswHhA7kZSp0g3Vqfsralfh6Y eqUwAGaDxsz8KdpBb9VqDDoMpZUN0vWkpYxORFsaonXcWL7bASao0JNjplTGc6SR0fx7 zOcw== X-Gm-Message-State: AOAM531LW8hWH59Dw4GjhhKQdOlO/TEF2SUwBGxgCLBErUtrINUGGcgL 4c4BbqYokB25bX2kUHholDk4dTYMTfiscj9PIe6Pb7K2rhjyY9WNpE7l5ZnqBRODNnptL51vh01 CYhLWn4ZPqQeDEQTreel+2fgcQeiS6gsO+D6NOfN45Q== X-Received: by 2002:a17:90a:c253:b0:1c9:ada2:f28d with SMTP id d19-20020a17090ac25300b001c9ada2f28dmr8153312pjx.17.1649225661591; Tue, 05 Apr 2022 23:14:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2HK18IXqt/40tkhpMC7q8gUSxns5PEP5DVsJ+exFaM5yDUUtNDVg63nYU7OXZBricw9I/iw== X-Received: by 2002:a17:90a:c253:b0:1c9:ada2:f28d with SMTP id d19-20020a17090ac25300b001c9ada2f28dmr8153287pjx.17.1649225661226; Tue, 05 Apr 2022 23:14:21 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-212-30.dynamic-ip.hinet.net. [59.115.212.30]) by smtp.gmail.com with ESMTPSA id r10-20020a17090a454a00b001c96a912aa0sm4482458pjm.3.2022.04.05.23.14.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 23:14:21 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [SRU][J/U/OEM-5.14][PATCH 5/6] ALSA: hda/cs8409: Disable HSBIAS_SENSE_EN for Cyborg Date: Wed, 6 Apr 2022 14:13:51 +0800 Message-Id: <20220406061352.966815-6-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220406061352.966815-1-chris.chiu@canonical.com> References: <20220406061352.966815-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stefan Binding BugLink: https://bugs.launchpad.net/bugs/1967988 For ESD reasons, all variants should now set HSBIAS_SENSE_EN. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov Link: https://lore.kernel.org/r/20220328115614.15761-6-vitalyr@opensource.cirrus.com Signed-off-by: Takashi Iwai (cherry picked from commit 5e74a144837997e6efc52c56d6686fb6c11c627e) Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index ce5fc03a8065..343fabc4387d 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -1005,15 +1005,8 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, cs8409_fix_caps(codec, CS8409_CS42L42_HP_PIN_NID); cs8409_fix_caps(codec, CS8409_CS42L42_AMIC_PIN_NID); - /* Set TIP_SENSE_EN for analog front-end of tip sense. - * Additionally set HSBIAS_SENSE_EN and Full Scale volume for some variants. - */ + /* Set HSBIAS_SENSE_EN and Full Scale volume for some variants. */ switch (codec->fixup_id) { - case CS8409_CYBORG: - spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x00a0; - spec->scodecs[CS8409_CODEC0]->full_scale_vol = - CS42L42_FULL_SCALE_VOL_MINUS6DB; - break; case CS8409_WARLOCK_MLK: case CS8409_WARLOCK_MLK_DUAL_MIC: spec->scodecs[CS8409_CODEC0]->hsbias_hiz = 0x0020;