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 2CC3D1AC446; Tue, 10 Sep 2024 17:22:35 +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=1725988956; cv=none; b=IcYXbmRm4v/uJi5RkG6bteRvP6VjrqmOpv/rvlrOK+4CfraARnJrB95KPRpvkIEFMhjU4q1GwxRXjb15YlEPFQPB1eTqwyySQxQodDUHP0TIfI9M/y1HC0/rGKWuUveZjfR63AnJ3pjIYe51yFw0kvecnW+/v5fMJuSOuz3ScgM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725988956; c=relaxed/simple; bh=VLg/IiS9Nf9MioR7T1yQ/8rRYU3SbZXJexeQEjfaUKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kGhgItzUi5Usq5Rn3unJUul4bKXnF7PEkrYMS+BdteccVDe3HovCroESNwsDs417MRyIyiUTHv6UKibiAMxVD3J15ZtoS3c816JoQCNBBym7vXK1amiyjlIoypU7yc7H80OAxh3GXtv0aFBGqRbN4olIH0rft5BT3UY2dmEO3js= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nISyI+yc; 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="nISyI+yc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6E0FC4CECD; Tue, 10 Sep 2024 17:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725988955; bh=VLg/IiS9Nf9MioR7T1yQ/8rRYU3SbZXJexeQEjfaUKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nISyI+ycVivL/fyHhi0INDez3VlIqjRgAoZE41vZix6h0xOSzWkqqRFE8qs5n1rIl vDZBdfuu1PNLh8D8x0S5gU9UBrIDsQaC6VJ+oXyt1KfRwa32X2VsHiO5i+jLgUC1SW FPIHNG8jn7pwxbqb7A83TxfMkjNO2UK2L+ru5m7GTAOfqIotZiFiwmhWDESJ2eZIPA 20C53XjnGaGU/eyayu49AMMb0nbeEaCmqZFpl8ixfHNJpgb2rac6nEqRxpyZYSfgOv 5v+wfRVrll/eHcr7Bjvn8N3tnfr8pYV9Uq4jhhfD3me6B89HXtr3BisF/qS4XhR5bs GytWvP6hcFxQw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Yi , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, trevor.wu@mediatek.com, zhourui@huaqin.corp-partner.google.com, claudiu.beznea@tuxon.dev, krzysztof.kozlowski@linaro.org, robh@kernel.org, kuninori.morimoto.gx@renesas.com, xiazhengqiao@huaqin.corp-partner.google.com, linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 6.10 08/18] ASoC: mediatek: mt8188-mt6359: Modify key Date: Tue, 10 Sep 2024 13:21:53 -0400 Message-ID: <20240910172214.2415568-8-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240910172214.2415568-1-sashal@kernel.org> References: <20240910172214.2415568-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.9 Content-Transfer-Encoding: 8bit From: Zhang Yi [ Upstream commit 5325b96769a5b282e330023e1d0881018e89e266 ] In order to get the correct keys when using the ES8326.We will associate SND_JACK_BTN_1 to KEY_VOLUMEUP and SND_JACK_BTN_2 to KEY_VOLUMEDOWN when the ES8326 flag is recognized. Signed-off-by: Zhang Yi Link: https://patch.msgid.link/20240816114921.48913-1-zhangyi@everest-semi.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index eba6f4c445ff..08ae962afeb9 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -734,6 +734,7 @@ static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd) struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(rtd->card); struct snd_soc_jack *jack = &soc_card_data->card_data->jacks[MT8188_JACK_HEADSET]; struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; + struct mtk_platform_card_data *card_data = soc_card_data->card_data; int ret; ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets, @@ -762,10 +763,18 @@ static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; } - snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + if (card_data->flags & ES8326_HS_PRESENT) { + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); + } else { + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + } + ret = snd_soc_component_set_jack(component, jack, NULL); if (ret) { -- 2.43.0