From nobody Wed Jan 7 23:11:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B50AD31ED77; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; cv=none; b=FGgyIm8M3JSEZ3I3SBJ642TjGWfol9rQj/CQAaqxFJ9dLmg2TLPytdN4ftWOf3ulFr2CQFI9Scayiy+da55G3MlHqE40f5zcRZ8nA+tMlUAq3lRxzoT2bp2aFXcI8UA8md7GZdcCf4AR5uKI8EGvn0hP1rpuLKbxPW0Gw0MKmW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; c=relaxed/simple; bh=FaPkSSs91ZDdRhCL8DhuMz0apf+MZljeUddiPVEEXBg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z45jJJN47K9zZ1FW+xT3GKRE6w3gkjYggr6xfjtAmz3Se+LQS8jZgwbnLfAHAuffWXZe7ytSIPBrGJTjJTJNQrJlOEmejQA4pRf/PYBTxCu+ajyah7P5kRV39kWWMiE0Y5sDn0Jhx1nOq3Th6lUnxonUmwyEW+u6IJGZkK25PGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hrS92SpL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hrS92SpL" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5C8F3C19421; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767582140; bh=FaPkSSs91ZDdRhCL8DhuMz0apf+MZljeUddiPVEEXBg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=hrS92SpLRDrIVAuIUNT7aAPiY5supma1YW9383+oUPhRHyASXGIVNvu4khOAFLpGS pzAjJ5rcCHexZNm2PTWxcS4mR45RjN69FPR+nZfIq4KgO7WwvesP5t9L3NvHjT6LVj wCPReWkMsnI2kSUsyhqovvbmzTfJA7SQghgOCAIJ2V049uTmvVAAClxMgRPZ4VxbBy UFt1Um0g+90ZbWa8L7dYOmJYmXJr/TNl9b5dJHIO4kry2esrkITsbHUmnULTzVJJBU V/JJTX1Od20H8iS+xdg8dFNnVUOCJ6gTl6hTN72+pVTR2kPji+nCz99rGEXjLoWSU4 LqBVedl/z8BYw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C33DC2A073; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) From: Sebastian Krzyszkowiak via B4 Relay Date: Mon, 05 Jan 2026 04:02:08 +0100 Subject: [PATCH RESEND 1/4] ASoC: wm8962: Add WM8962_ADC_MONOMIX to "3D Coefficients" mask Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-wm8962-l5-fixes-v1-1-f4f4eeacf089@puri.sm> References: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> In-Reply-To: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@puri.sm, Sebastian Krzyszkowiak X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=835; i=sebastian.krzyszkowiak@puri.sm; h=from:subject:message-id; bh=MPPG80PySyuGNcKziBA/WqMsI63UkAvo4Yv3+TQYRJQ=; b=owEBbQKS/ZANAwAKAejyNc8728P/AcsmYgBpWym6qDr2a/Q6H8GzN8+Uc8NrpWwL4yoQRAago asY65vMBmaJAjMEAAEKAB0WIQQi3Z+uAGoRQ1g2YXzo8jXPO9vD/wUCaVspugAKCRDo8jXPO9vD /48wD/4xoxLlmRzApRATU9ZO7YK+dFvbF7q7ENopAv7x3zwYkpwBZ4T0r9fCSqABHZqbIS2iiFf u/3eGWM7pGjYa27Uj0sL5fSynl90jxo2fT9kJsF2Lf1X7ZFA3Zc1Xcp/AkxooFJDbJQjCskn7g4 2XDufdGPaLVN/dlGqnyfh1GLt/NsAGfoiCJANh9AXaNvPrpeV0alBg4YRi9wb169X1PdomfETeh VINk0gEAKxX7Pmoww4wxn/4K3XfyF3k+de8cTg2o517BNJxuFg9YBj1j521XeoxTtHp9YT3KjwF BRfOxo2zJNunGjHjcz8r6dv1Qy+nE48tnvpsDplC7HFr616cMZm/HBSrIEvO/dQfsioOOy0EfCx mxyFhSd132XYRHqPpqM5aZziQvrXS6utBwBeEBr8N+zpzZ9Qt+Y+NTQol8kxPYLqgFXuWyIilU+ SnIjtqeX3wTQPlitulG04dSkw1NfZklp4jgojC2LHJ+QvhSGl9zjy3G80wyP1973Z3E4tihcqzm XjagFjkCbuv/1Dsr3GxU74InZwiybU5mCDPiLlgB+483t2IwwzmzIQ6kXBhWPLaGuL3UfNbnZ1I ZjEWa2xffOqQNmnln7++rwiypRPcM3sGVYAND13Mr9jXw6rtX1zeSJNfp/jDOrDfEcx2x2ljbbA PUROk8ZU+rskTlQ== X-Developer-Key: i=sebastian.krzyszkowiak@puri.sm; a=openpgp; fpr=22DD9FAE006A11435836617CE8F235CF3BDBC3FF X-Endpoint-Received: by B4 Relay for sebastian.krzyszkowiak@puri.sm/default with auth_id=32 X-Original-From: Sebastian Krzyszkowiak Reply-To: sebastian.krzyszkowiak@puri.sm From: Sebastian Krzyszkowiak This bit is handled by a separate control. Signed-off-by: Sebastian Krzyszkowiak Reviewed-by: Charles Keepax --- sound/soc/codecs/wm8962.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index e9e317ce6898..1040740fc80f 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1760,7 +1760,7 @@ SND_SOC_BYTES("EQR Coefficients", WM8962_EQ24, 18), =20 =20 SOC_SINGLE("3D Switch", WM8962_THREED1, 0, 1, 0), -SND_SOC_BYTES_MASK("3D Coefficients", WM8962_THREED1, 4, WM8962_THREED_ENA= ), +SND_SOC_BYTES_MASK("3D Coefficients", WM8962_THREED1, 4, WM8962_THREED_ENA= | WM8962_ADC_MONOMIX), =20 SOC_SINGLE("DF1 Switch", WM8962_DF1, 0, 1, 0), SND_SOC_BYTES_MASK("DF1 Coefficients", WM8962_DF1, 7, WM8962_DF1_ENA), --=20 2.52.0 From nobody Wed Jan 7 23:11:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B51D331ED7A; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; cv=none; b=nSS9HjyCRUHmnR+WjGUhLEHwT9fR4lhCklJP0KBp7pC/qlnk5eSyo/U+y0ajd4cmueyfAps/+YpX27/pN33DoFLz3alJ1r5NKrnOEvzM0jyRuFCj2XUOJiELsyTaySGeBLhCyhFGq/UFgne/dox/lUmaS2CfOF8VFcj1tzuUHqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; c=relaxed/simple; bh=CTAYLAHsfHqJLcUihGHg3uFhYQmPcsVKmrcI3ybfFz0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eikqYPvrL78F4fbkUETruy1Rj2qYAvpP/fHN/UiCTBQQ07NOtlENh1lf+KEhNP407p1dKVCDX//ViWCRmmWOyTdd0O/rEo6YFa/+BD7OB/cCFJP9jwOyUb6xK/eRjOnISt9H4fzZDVUttDf87P+nWcdJFaB83WEgZ4dpOCqdjbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DwaBX+oE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DwaBX+oE" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6B44BC116C6; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767582140; bh=CTAYLAHsfHqJLcUihGHg3uFhYQmPcsVKmrcI3ybfFz0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=DwaBX+oEPhS5JtPrf9umJxr12gaayWPvgCTAc/6U9Oqxhg3IfdmwdR1e8sZqo2pBH /6E9BCd8RM27LAUJ5oYr7XXpcoVZl7EHGnm+tX+CqWANq/8FdSiEjZrLYNuaLQhvn7 3O69xxvXYlk2/QskCPtsbZqB8H6HYVJBIE6ZgJFTZARxsnqkOcynzYjDD6HaKv2zUc RDCSGmAJ8SaTJe3XVRdVoMs6pg18elY6r97WeK1zjIlHu723s1D4/AIRIz80zj17js Ds98NIdtHQYpWchQtDU0sL3mlfSvBHWSYGBVtOTobtaaGA3VaYkyWFSUKHNo7cDeZk 7cJvoAMMMB9Sw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D953C2A062; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) From: Sebastian Krzyszkowiak via B4 Relay Date: Mon, 05 Jan 2026 04:02:09 +0100 Subject: [PATCH RESEND 2/4] ASoC: wm8962: Don't disable SYSCLK if it's enabled via DAPM Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-wm8962-l5-fixes-v1-2-f4f4eeacf089@puri.sm> References: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> In-Reply-To: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@puri.sm, Sebastian Krzyszkowiak X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1081; i=sebastian.krzyszkowiak@puri.sm; h=from:subject:message-id; bh=zi9x3EPPEK4Yh40bqI+3+mLaNvPm7zKYWzZHed95l70=; b=owEBbQKS/ZANAwAKAejyNc8728P/AcsmYgBpWym6PnwEVZ9Qtq8KimokKQk+8unH/eXMqoTqA B15OHY4o6+JAjMEAAEKAB0WIQQi3Z+uAGoRQ1g2YXzo8jXPO9vD/wUCaVspugAKCRDo8jXPO9vD /0dYEACIX5JzcG+olaDmbJpsvi2Ub2/q3G3+k5Iu7PrAJjK+nSAVYCAti7yyyb0Zx9UwFB2t+k3 ZMAMQmdz2jW02WDxzN6vySrjtD42PAVAim6VWOgREVggF22sJNrzWQL4FqGyrfmNuGE82krvzgX 5OldYSUVQAuvN9sKj4++X0MSNGxywGpaUArGWYS15rBG2piecnj5V2r1QWUqm3p97DeSnkWRC7T qJugYYeKj+aTi3QZDFw2lHvLJY4MQBbQj0ut4Vo9dOXLF0ZVzagk4IOq+Zw9JZ4HubgNbhR0pZv 6JR5x8I/pI9wXysFlQc9Gdc+udCLaGIQcojrlwrf9WJ/3JsLafPv9u+CcnEp5px3h7u6axOk6yp MR3GmLAIcbnsARKPU8jp4JbgrwiqF6rWKnvqzlFNUqnsaJoPhhGDte5z2/7AicdLBmEUYzSTpfP Sr0ufgO7x3kjJcLYC3pymCusxlO24M8/0K02C3CZbi2HEMEXipEKEDgeciMsFF331UlbCcMt4WZ xpHq5ILUYF/UomB95ioSAEhJg2bJAsrhzGTYZMdIGQEiReQyu+fz1HU6PJ294OIgy7WcSiUvcpe IUZOEgNp6lyERBs7OXfE115HL3ix5NUameDMPjRIM3pvMFyDIsrXaYQX1qIh/5SZYo/p6FENOY/ 7H6hCghmIPetgdw== X-Developer-Key: i=sebastian.krzyszkowiak@puri.sm; a=openpgp; fpr=22DD9FAE006A11435836617CE8F235CF3BDBC3FF X-Endpoint-Received: by B4 Relay for sebastian.krzyszkowiak@puri.sm/default with auth_id=32 X-Original-From: Sebastian Krzyszkowiak Reply-To: sebastian.krzyszkowiak@puri.sm From: Sebastian Krzyszkowiak If SYSCLK pin is enabled via DAPM, wm8962_configure_bclk may turn it off behind DAPM's back, making it assume that the clock is still enabled even if it actually isn't, which can end up with it not being enabled for playback or capture when it's needed. Signed-off-by: Sebastian Krzyszkowiak --- sound/soc/codecs/wm8962.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 1040740fc80f..843b8c6b40a4 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2520,7 +2520,8 @@ static void wm8962_configure_bclk(struct snd_soc_comp= onent *component) usleep_range(500, 1000); dspclk =3D snd_soc_component_read(component, WM8962_CLOCKING1); =20 - if (snd_soc_dapm_get_bias_level(dapm) !=3D SND_SOC_BIAS_ON) + if (snd_soc_dapm_get_bias_level(dapm) !=3D SND_SOC_BIAS_ON + && !snd_soc_dapm_get_pin_status(dapm, "SYSCLK")) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, 0); =20 --=20 2.52.0 From nobody Wed Jan 7 23:11:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C16EE31ED7F; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; cv=none; b=Hwjt1c1TNsUPJCLXJJ7WXhuoU+KBvJ7jIEoGNxayz6LGVrSZr0rAd0YizmbfYnMKScUjlXPcNdoblTyqywbFr94LNVJ3JRqyn0HVu/tqVUc6jKfLPFeoI2cH8aVHxrVRiRvywqSDXhgbKkpVkB1V/TbxK2eWpSiltZ4DTjCBdxI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; c=relaxed/simple; bh=8FfGrSg6H3pMB94xW+1y5Oxc5TI5MP4zF40+FjbXThA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f684bfqKeVmHoRuoupdXumYoZCLuqHKZPqB37uWsFiaD4MhQvZeG9TpK0ruum2e4sgvWno9Vee4k1BQOQKVJzE3goaFj+dlFPcdsuh9m0HdV0RxkEup8opaz/m7bDOdK2wjjRUrvdDRjXgRv8jBDjMk1GYPPSxXFtpvU/Yhgy/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Af9wyIac; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Af9wyIac" Received: by smtp.kernel.org (Postfix) with ESMTPS id 76CD2C2BCAF; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767582140; bh=8FfGrSg6H3pMB94xW+1y5Oxc5TI5MP4zF40+FjbXThA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Af9wyIacqHp7iMxUbBZITvBDC7+1lGNkwhUvhVVF++5UBfiH4uMUJanYXj+htUtNv 8F42oK9ZvzeH7aEREDfN1HW4/+cUGFc2cuewUii88S+9sSdLAaKHcGAxfxPkZwOjLf 6yp6R92yWCiSFLWsWfj57iY9xU7cM+OOEts+ltGsgB8GcfXJdgaeCWSwhoHTCrIXhn a2rR87ZR7rOuS1eM7imC7aZAHUXLYrpgg1S9Yh0+7IM5+peMxqxx2Glr7rp5iWiz+S v1GXodhJCaZiryXCya6Q98Nrgi+4blO7Z9Z+LPtb2TceQTL4qy2wkeRONWvq9nIJxP dgroWcrcx1wNw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CA31C2A077; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) From: Sebastian Krzyszkowiak via B4 Relay Date: Mon, 05 Jan 2026 04:02:10 +0100 Subject: [PATCH RESEND 3/4] ASoC: wm8962: Don't report a microphone if it's shorted to ground on plug Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-wm8962-l5-fixes-v1-3-f4f4eeacf089@puri.sm> References: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> In-Reply-To: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@puri.sm, Sebastian Krzyszkowiak X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1365; i=sebastian.krzyszkowiak@puri.sm; h=from:subject:message-id; bh=Ihi1/3FQbf8+c123/VfTZPL88wj1LxemPR2Lj4RLjvk=; b=owEBbQKS/ZANAwAKAejyNc8728P/AcsmYgBpWym6ai/WV0raWlCpeuwKy523q725Tu4P4N8Nh OwH1lYL7R6JAjMEAAEKAB0WIQQi3Z+uAGoRQ1g2YXzo8jXPO9vD/wUCaVspugAKCRDo8jXPO9vD /yeCD/9tWXBcouUQDNLf7cbS+4mOoaW1ESCxMuroGhxIfZiVfQqH5IFIG5uYG8hsUSasSqfVw65 0oZPDVQGGA9+Oj8XlUb3fwqREW9Z14wp570QWasYHlHsT3bsd1/K/+8SpGCTsFxSowSMY8iJfsK rbM0gpBOnAHR8sQWUEBVsryVuMmM5puA9fj+Q3L62wVrgas4K0/oPcBsRHiUw8F7dz/mK1cPwhE egX9Rf1dh/tRkJSZci42lOauGbaFfVBc9iVcR8j0FSf0R9mkbTzgHdURsApkvqh92gqPxa7/Jip LXOiPJ2FFK1oTDhwiVFtEG0YNZYkiZ9TrGSgJ6ScBUpL43l+uy7sgCe0bQ4u3wnUEPuvYbCxF6A 2I7KIOJc+EtpZKjv01msAdNe4Hck9cHCzYBvlmRP1eVgG1rHRtTCg9OGWyHO1kVpJorw+bcktnU 0xFojry8K/1KEVMJCmZK8YB1H9i4SR2/xmUTGGfare/v2JK3a7JTtEER2kuh2aRp0L0geLczNzI /MfsDnm66jhyOZgDY48XNQtULZHit6LHIMLcGNPO8nZBgzHpKQvR1B4LlH1DC3tmCfRfatl38tN iiEfkXf0ru8evoDAnL9ac324RRCxsgyLIaDiVij5az8woOhhGY5BWbHZganenET+j1eSiEnqrSl DkykNT584BRejDw== X-Developer-Key: i=sebastian.krzyszkowiak@puri.sm; a=openpgp; fpr=22DD9FAE006A11435836617CE8F235CF3BDBC3FF X-Endpoint-Received: by B4 Relay for sebastian.krzyszkowiak@puri.sm/default with auth_id=32 X-Original-From: Sebastian Krzyszkowiak Reply-To: sebastian.krzyszkowiak@puri.sm From: Sebastian Krzyszkowiak This usually means that a TRS plug with no microphone pin has been plugged into a TRRS socket. Cases where a user is plugging in a microphone while pressing a button will be handled via incoming interrupt after the user releases the button, so the microphone will still be detected once it becomes usable. Signed-off-by: Sebastian Krzyszkowiak Reviewed-by: Charles Keepax --- sound/soc/codecs/wm8962.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 843b8c6b40a4..dd73b4dc1b97 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -67,6 +67,8 @@ struct wm8962_priv { struct mutex dsp2_ena_lock; u16 dsp2_ena; =20 + int mic_status; + struct delayed_work mic_work; struct snd_soc_jack *jack; =20 @@ -3082,8 +3084,16 @@ static void wm8962_mic_work(struct work_struct *work) if (reg & WM8962_MICSHORT_STS) { status |=3D SND_JACK_BTN_0; irq_pol |=3D WM8962_MICSCD_IRQ_POL; + + /* Don't report a microphone if it's shorted right after + * plugging in, as this may be a TRS plug in a TRRS socket. + */ + if (!(wm8962->mic_status & WM8962_MICDET_STS)) + status =3D 0; } =20 + wm8962->mic_status =3D status; + snd_soc_jack_report(wm8962->jack, status, SND_JACK_MICROPHONE | SND_JACK_BTN_0); =20 --=20 2.52.0 From nobody Wed Jan 7 23:11:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C178731ED83; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; cv=none; b=hL+vPkiNaXmlhnPN9GLuY9z/RJfCn36dmqsxcuaZMf02u8syTGYI3DtDirCIfDaHqmC3QgMBoKkY8axve5D9Ma8S1eYlMLkcVigPqEB5mqmnF4DYytAiop7el5YYvAR3ivGDJMzSklUvt5FONANVZTrFOs2sEchekw9xnj9VLVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767582140; c=relaxed/simple; bh=2niv4RGgAeUlU/funs/L3rS0qUsoyj0ojV/I1XGAT/s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f7W/9FcTVCpSV6VEIyQC0mAskDSX5B2REZK3/f/wVTjCeUaEU3nMXpEKardoNPHmCVx+9ZwVhTuPybX+YfgQATD1wc9eHzUbhEPx+MCKU5biFwh8oolF6jy8n9mntBvrLBJaXXXK5BJYbHNEJ7GLUzqjXnH+luI64QNJqK4twrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Lp9vVtZx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Lp9vVtZx" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8035AC2BCB0; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767582140; bh=2niv4RGgAeUlU/funs/L3rS0qUsoyj0ojV/I1XGAT/s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Lp9vVtZxp+bPwzSBBvqeXSyKoOPR8AH9xdyN7Q8rtuXgzKIA5E0tQNGcXN4rQq94E 0OuQTnqO7+bSrY1DBebInaS/8tAoXxZvf6+QoRyFASEcY9aYe9sPsAeWAcms4OE85w h2IWtwIQJmxzspYxOQyZlzvanYtpZC39upay6ptFlsuDQsHvc9OJC/hV3p4CgvkN6m twF7NreShlAoviOWbFydqwQXzwlsGauNFmF7CBh1p9IeirHLjDSi0HX+tW7cCJUis5 rSSFd11uhSn4pLVNCW+gX1oan31DvWfZ8gCdO2X8ptI/9CsjD9aMultdep1qdYYpPx nnTCvKXDfDlFw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 793D5C2A074; Mon, 5 Jan 2026 03:02:20 +0000 (UTC) From: Sebastian Krzyszkowiak via B4 Relay Date: Mon, 05 Jan 2026 04:02:11 +0100 Subject: [PATCH RESEND 4/4] ASoC: wm8962: Don't mark WM8962_ADDITIONAL_CONTROL_4 as volatile Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260105-wm8962-l5-fixes-v1-4-f4f4eeacf089@puri.sm> References: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> In-Reply-To: <20260105-wm8962-l5-fixes-v1-0-f4f4eeacf089@puri.sm> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@puri.sm, Sebastian Krzyszkowiak X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1278; i=sebastian.krzyszkowiak@puri.sm; h=from:subject:message-id; bh=I+p2kXXsP7IpiWWwmySXWCxbRExD53OdyEq1epRLdsQ=; b=owEBbQKS/ZANAwAKAejyNc8728P/AcsmYgBpWym6zyukpSwhSxOW50U57F8rdpbkdLRU6ieA7 t5PJl61/lKJAjMEAAEKAB0WIQQi3Z+uAGoRQ1g2YXzo8jXPO9vD/wUCaVspugAKCRDo8jXPO9vD /4f1D/9s0sgg7mxSrEUIf2YvUONHWyv/4N2nG4mp06Pb4qKPsoTpamHNWY2loKYALWJLHaXFNMj gsLHwvvDzMZwMULncfIu86Hx1M90aqQBmB/4zGWYMhpJ0/0bkFUCJgz+P0z6tCuaPD9mmuWqsVN Om09KP1n8gWT/v01nmGLN3ftcFYd75e6dibSpgAvxMj/3PcKCXlxWnN3p4DHC+9VLTe9wP2Gp5y LLDLJmKDfDQcCPYBswjIuWCIFYGZG7h9FGTVcmQww+ecvEhgnwFg/LO+EK72eKnWdh/14h1tZLK XFEy3r1kKgaGfC7lTLofF8/NdSu9zeTN7A/OQPb+svb5JaxuDXdJfZ0dBezJvaaP0CwWyVgDoIc U8kLMQQD/7CZHWvEHUDYFynLDuA1XG8tGec/hPD9f0ULweI/Bh4MCmb2FT4M8sSCtf66SaeavFd 6zaTgAbzm1BjYBUpIkGfKixMa6zB5gVDQknPDtiNTGzengWsFta8ZfyLg3jMgIX6BAqe3f27MkQ GI7oJ4B2+1jGjNNKFaMkNAQR8YktBogvO2yAZx2hACaC0q5iFwP+bCSJBrUSfMelZ+pdex+i5op ye/aWLc1JNCMndHWm+hHHHYjATgYHrCfgeAbNTBFT7aNRFJAnxsImUW1CyYoIv0eUB0Ker76+H9 KTi4cjlgL3wfdjg== X-Developer-Key: i=sebastian.krzyszkowiak@puri.sm; a=openpgp; fpr=22DD9FAE006A11435836617CE8F235CF3BDBC3FF X-Endpoint-Received: by B4 Relay for sebastian.krzyszkowiak@puri.sm/default with auth_id=32 X-Original-From: Sebastian Krzyszkowiak Reply-To: sebastian.krzyszkowiak@puri.sm From: Sebastian Krzyszkowiak Only some bits of that register are actually volatile, so to prevent issues with caching let's simply bypass the cache explicitly when we access these particular bits. This fixes mic-cfg value not being reapplied after runtime resume. Signed-off-by: Sebastian Krzyszkowiak --- sound/soc/codecs/wm8962.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index dd73b4dc1b97..22101284c095 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -793,7 +793,6 @@ static bool wm8962_volatile_register(struct device *dev= , unsigned int reg) case WM8962_CLOCKING1: case WM8962_SOFTWARE_RESET: case WM8962_THERMAL_SHUTDOWN_STATUS: - case WM8962_ADDITIONAL_CONTROL_4: case WM8962_DC_SERVO_6: case WM8962_INTERRUPT_STATUS_1: case WM8962_INTERRUPT_STATUS_2: @@ -3074,7 +3073,9 @@ static void wm8962_mic_work(struct work_struct *work) int irq_pol =3D 0; int reg; =20 + regcache_cache_bypass(wm8962->regmap, true); reg =3D snd_soc_component_read(component, WM8962_ADDITIONAL_CONTROL_4); + regcache_cache_bypass(wm8962->regmap, false); =20 if (reg & WM8962_MICDET_STS) { status |=3D SND_JACK_MICROPHONE; --=20 2.52.0