From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE240C4167D for ; Sun, 29 Oct 2023 22:57:59 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CBDE5DEE; Sun, 29 Oct 2023 23:57:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CBDE5DEE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1698620277; bh=YP/Bagg/FmJOMvQhIt3xBhDBmQHqsMT6vRhRKIcACBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qlvuD5Ch+up2W7wzm0RwM7t2Cui6vh8jxclChQNTLXP/fB6waRJBGJ2OL7t//OeA3 5hcneBOsakR7eKC8caDSso0VzO4IL012v/iU7LialLuVFXwH9HDb2rrKMtti42JLsK ONY+BQcW+YFsYHSnJyeEeU/vbP0rrUaeoNAx1V8Y= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 70D8FF8055A; Sun, 29 Oct 2023 23:57:01 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id EB21FF80578; Sun, 29 Oct 2023 23:57:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 05B17F80578; Sun, 29 Oct 2023 23:56:16 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6F783F80494 for ; Sun, 29 Oct 2023 23:56:10 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6F783F80494 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=IbKWAu/Q Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 78FD3B80707; Sun, 29 Oct 2023 22:56:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEC49C43397; Sun, 29 Oct 2023 22:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620168; bh=YP/Bagg/FmJOMvQhIt3xBhDBmQHqsMT6vRhRKIcACBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbKWAu/Qc0Mg5kGqTfTYH6w2YCyhKwnv/fIZiFBTTy2IW1BZi5xcuyBpU56eo0Y8H 31gzECFAbH2jtQFCltuxJkXlvQCMvDOFB+8LGrW4Y9C8SjG92+1HFZeSkpyvYqwIaX KgyZEJ51Z+LMuJRF1sIOi1lQ9XDpsDIqIFOHpMW5Hd521UscsHNzfborkK+ix3m+Lh VBm4I0KL61Ks0KafE+OGZ8wLYcU/fVFztt2TtBzH6XyXiRTLCCRN4yMGAbeLjPmq8f DIf0uFgv88XGSFd/pHrBZX+AmBYBbvgpZl3VdLTzDwA3o5vVojZfELUf2Ng9MEhWld XAZgsfsn8PbWA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Rau , Mark Brown , Sasha Levin , support.opensource@diasemi.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 6.5 37/52] ASoC: da7219: Correct the process of setting up Gnd switch in AAD Date: Sun, 29 Oct 2023 18:53:24 -0400 Message-ID: <20231029225441.789781-37-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225441.789781-1-sashal@kernel.org> References: <20231029225441.789781-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit Message-ID-Hash: DYZMVTRRMZGDF5O4XZV2EKGOO6UATB64 X-Message-ID-Hash: DYZMVTRRMZGDF5O4XZV2EKGOO6UATB64 X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: David Rau [ Upstream commit e8ecffd9962fe051d53a0761921b26d653b3df6b ] Enable Gnd switch to improve stability when Jack insert event occurs, and then disable Gnd switch after Jack type detection is finished. Signed-off-by: David Rau Link: https://lore.kernel.org/r/20231017021258.5929-1-David.Rau.opensource@dm.renesas.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/da7219-aad.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c index 581b334a6631d..3bbe850916493 100644 --- a/sound/soc/codecs/da7219-aad.c +++ b/sound/soc/codecs/da7219-aad.c @@ -59,9 +59,6 @@ static void da7219_aad_btn_det_work(struct work_struct *work) bool micbias_up = false; int retries = 0; - /* Disable ground switch */ - snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00); - /* Drive headphones/lineout */ snd_soc_component_update_bits(component, DA7219_HP_L_CTRL, DA7219_HP_L_AMP_OE_MASK, @@ -155,9 +152,6 @@ static void da7219_aad_hptest_work(struct work_struct *work) tonegen_freq_hptest = cpu_to_le16(DA7219_AAD_HPTEST_RAMP_FREQ_INT_OSC); } - /* Disable ground switch */ - snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00); - /* Ensure gain ramping at fastest rate */ gain_ramp_ctrl = snd_soc_component_read(component, DA7219_GAIN_RAMP_CTRL); snd_soc_component_write(component, DA7219_GAIN_RAMP_CTRL, DA7219_GAIN_RAMP_RATE_X8); @@ -421,6 +415,11 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data) * handle a removal, and we can check at the end of * hptest if we have a valid result or not. */ + + cancel_delayed_work_sync(&da7219_aad->jack_det_work); + /* Disable ground switch */ + snd_soc_component_update_bits(component, 0xFB, 0x01, 0x00); + if (statusa & DA7219_JACK_TYPE_STS_MASK) { report |= SND_JACK_HEADSET; mask |= SND_JACK_HEADSET | SND_JACK_LINEOUT; -- 2.42.0