From mboxrd@z Thu Jan 1 00:00:00 1970 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 2C2862522B9; Wed, 23 Apr 2025 14:49:07 +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=1745419748; cv=none; b=jXsQagYupil5oRf+XBFKYjCE2r0RIjn3LG7LrN8E2yXukdZRHLY90s1Ucf3UG442dpXh8pVjfpjbfCSEyrBnax1uLLuo4R3sIgBTPXz/63p8Hhe3jT5tmA/ZOUd5uTyPWv6dvrnOC0HxlNus196+YSNh8GS97RpdwtiFk4IAUy8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745419748; c=relaxed/simple; bh=1WEK0xOwivnJkgt0MAcK2+hMvRI+9lRP21eBNW0uh4E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Db6rLN/2pFFa02AQCduR2fi/ue7Rbbgj41QEY7crJQrBAkQ0lWIecHGX62KhDKFkzWZtZmGFBuclwoR2lsQvfhmPkeCsRBOyLkt+PywatQJr80BWwcNzT/OiQEcEDDDO3BZd5gjJ8wQnnzLPcSKsUulrzdv7OsZtzv5dDAoih3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I0OJK82w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="I0OJK82w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B63CC4CEE3; Wed, 23 Apr 2025 14:49:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745419747; bh=1WEK0xOwivnJkgt0MAcK2+hMvRI+9lRP21eBNW0uh4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I0OJK82wKiRZb2LNbi2pB5NJtF4VW7+z68o2P/vivumpfg8Zs6irA25w2bdlXWIrl 7Koc1GZ0LDa5zPL/hVBFtKxRFtcEVhPSamA5izWWvIgrsjWu+IMyDEx7jPenCqocqf NbFlh8QyB7OBCWErMugZKCZBgFO/7flJmiJLm6Z8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Charles Keepax , Mark Brown , Sasha Levin Subject: [PATCH 6.14 020/241] ASoC: cs42l43: Reset clamp override on jack removal Date: Wed, 23 Apr 2025 16:41:24 +0200 Message-ID: <20250423142621.344382775@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142620.525425242@linuxfoundation.org> References: <20250423142620.525425242@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Charles Keepax [ Upstream commit 5fc7d2b5cab47f2ac712f689140b1fed978fb91c ] Some of the manually selected jack configurations will disable the headphone clamp override. Restore this on jack removal, such that the state is consistent for a new insert. Fixes: fc918cbe874e ("ASoC: cs42l43: Add support for the cs42l43") Signed-off-by: Charles Keepax Link: https://patch.msgid.link/20250409120717.1294528-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/cs42l43-jack.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/codecs/cs42l43-jack.c b/sound/soc/codecs/cs42l43-jack.c index ac19a572fe70c..20e6ab6f0d4ad 100644 --- a/sound/soc/codecs/cs42l43-jack.c +++ b/sound/soc/codecs/cs42l43-jack.c @@ -702,6 +702,9 @@ static void cs42l43_clear_jack(struct cs42l43_codec *priv) CS42L43_PGA_WIDESWING_MODE_EN_MASK, 0); regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CTRL, CS42L43_JACK_STEREO_CONFIG_MASK, 0); + regmap_update_bits(cs42l43->regmap, CS42L43_STEREO_MIC_CLAMP_CTRL, + CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK, + CS42L43_SMIC_HPAMP_CLAMP_DIS_FRC_MASK); regmap_update_bits(cs42l43->regmap, CS42L43_HS2, CS42L43_HSDET_MODE_MASK | CS42L43_HSDET_MANUAL_MODE_MASK, 0x2 << CS42L43_HSDET_MODE_SHIFT); -- 2.39.5