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 D5C83200A5 for ; Mon, 6 Nov 2023 13:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EsYOBqBI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50922C433C7; Mon, 6 Nov 2023 13:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1699275998; bh=ISzQWBVPlGws7miFRtVtCNpDES8o1hhax5UaIEj6OBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EsYOBqBIgFgSoDo274/uvxwRjMdUWMZl2ZRfTpzmPla2ViUmr6DtA/WMRERoJDCAN gMsIqvzoz1/4wiM9PQnijLZmMtUiXcvmIZSsuGlxrA9AARlhcdtjc/fKZshmTAUvTN yhbM6++xJDRvKob6DYlBi1o1iHbcbZfp+oO1aswM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shuming Fan , Mark Brown , Sasha Levin Subject: [PATCH 4.14 35/48] ASoC: rt5650: fix the wrong result of key button Date: Mon, 6 Nov 2023 14:03:26 +0100 Message-ID: <20231106130259.060680865@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231106130257.862199836@linuxfoundation.org> References: <20231106130257.862199836@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuming Fan [ Upstream commit f88dfbf333b3661faff996bb03af2024d907b76a ] The RT5650 should enable a power setting for button detection to avoid the wrong result. Signed-off-by: Shuming Fan Link: https://lore.kernel.org/r/20231013094525.715518-1-shumingf@realtek.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5645.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 01de25813c72b..822c42101c3f0 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3220,6 +3220,8 @@ int rt5645_set_jack_detect(struct snd_soc_codec *codec, RT5645_GP1_PIN_IRQ, RT5645_GP1_PIN_IRQ); regmap_update_bits(rt5645->regmap, RT5645_GEN_CTRL1, RT5645_DIG_GATE_CTRL, RT5645_DIG_GATE_CTRL); + regmap_update_bits(rt5645->regmap, RT5645_DEPOP_M1, + RT5645_HP_CB_MASK, RT5645_HP_CB_PU); } rt5645_irq(0, rt5645); -- 2.42.0