From nobody Sun Sep 22 09:17:55 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB44FC433FE for ; Wed, 16 Mar 2022 06:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353780AbiCPGDj (ORCPT ); Wed, 16 Mar 2022 02:03:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353744AbiCPGDN (ORCPT ); Wed, 16 Mar 2022 02:03:13 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5769E606E7; Tue, 15 Mar 2022 23:01:57 -0700 (PDT) X-UUID: a2319d33ea654768866183ade374bfc4-20220316 X-UUID: a2319d33ea654768866183ade374bfc4-20220316 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1031803154; Wed, 16 Mar 2022 14:01:47 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 16 Mar 2022 14:01:46 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Mar 2022 14:01:46 +0800 From: Trevor Wu To: , , , CC: , , , , , , , , Subject: [PATCH v2 3/5] ASoC: mediatek: mt8195: rename card controls Date: Wed, 16 Mar 2022 14:01:37 +0800 Message-ID: <20220316060139.6211-4-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220316060139.6211-1-trevor.wu@mediatek.com> References: <20220316060139.6211-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In order to be able to reuse the same configurations in user space, rename the controls to generic names. "Headphone Jack" -> "Headphone" "Speakers" -> "Ext Spk" "Left Speaker" -> "Left Spk" "Right Speaker" -> "Right SPk" Signed-off-by: Trevor Wu --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek= /mt8195/mt8195-mt6359.c index 544e99c83f3f..5ad6363e1bc9 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -64,7 +64,7 @@ struct sof_conn_stream { #define SOF_DMA_UL5 "SOF_DMA_UL5" =20 static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] =3D { - SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIXER(SOF_DMA_DL2, SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER(SOF_DMA_DL3, SND_SOC_NOPM, 0, 0, NULL, 0), @@ -73,14 +73,14 @@ static const struct snd_soc_dapm_widget mt8195_mt6359_w= idgets[] =3D { }; =20 static const struct snd_kcontrol_new mt8195_mt6359_controls[] =3D { - SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), }; =20 static const struct snd_soc_dapm_route mt8195_mt6359_routes[] =3D { /* headset */ - { "Headphone Jack", NULL, "HPOL" }, - { "Headphone Jack", NULL, "HPOR" }, + { "Headphone", NULL, "HPOL" }, + { "Headphone", NULL, "HPOR" }, { "IN1P", NULL, "Headset Mic" }, /* SOF Uplink */ {SOF_DMA_UL4, NULL, "O034"}, @@ -95,30 +95,30 @@ static const struct snd_soc_dapm_route mt8195_mt6359_ro= utes[] =3D { }; =20 static const struct snd_soc_dapm_widget mt8195_dual_speaker_widgets[] =3D { - SND_SOC_DAPM_SPK("Left Speaker", NULL), - SND_SOC_DAPM_SPK("Right Speaker", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), }; =20 static const struct snd_kcontrol_new mt8195_dual_speaker_controls[] =3D { - SOC_DAPM_PIN_SWITCH("Left Speaker"), - SOC_DAPM_PIN_SWITCH("Right Speaker"), + SOC_DAPM_PIN_SWITCH("Left Spk"), + SOC_DAPM_PIN_SWITCH("Right Spk"), }; =20 static const struct snd_soc_dapm_widget mt8195_speaker_widgets[] =3D { - SND_SOC_DAPM_SPK("Speakers", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), }; =20 static const struct snd_kcontrol_new mt8195_speaker_controls[] =3D { - SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Ext Spk"), }; =20 static const struct snd_soc_dapm_route mt8195_rt1011_routes[] =3D { - { "Left Speaker", NULL, "Left SPO" }, - { "Right Speaker", NULL, "Right SPO" }, + { "Left Spk", NULL, "Left SPO" }, + { "Right Spk", NULL, "Right SPO" }, }; =20 static const struct snd_soc_dapm_route mt8195_rt1019_routes[] =3D { - { "Speakers", NULL, "Speaker" }, + { "Ext Spk", NULL, "Speaker" }, }; =20 #define CKSYS_AUD_TOP_CFG 0x032c --=20 2.18.0