From patchwork Thu Mar 24 05:38:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?VHJldm9yIFd1ICjlkLPmlofoia8p?= X-Patchwork-Id: 12790385 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 42B60C433F5 for ; Thu, 24 Mar 2022 05:39:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DeoSQzklLXGx8QO94R8hAvqGmaDDE7AM69A68HTlr34=; b=KrG9ge2hHKdfN/ mj4nl9IxRrPoZG2ZH/OivIgPdTRpxAK2a8mT3MpR6ke9/IJWbapF84AG62Rq6z8KcgqOKP9irSRtc 56ATZ2AYO9Ux7qMfHtkFjxvSvsDmw6QSRr05/Q5DziwUuk/oRg5x1hYySpQRksI0jFzF51bBAPkUG 7IrwXzJavMardAulAe0vJakUJRodihfmwDvjGOSiJimPxkMd757pV/+co+fqYuL6pLMXh+pNEGjsq 0FUfTOsSwSaXqHXUY4BlyJ+tXOzFu23uqtip7IjWVKzuVBCv9KyuRB4Pq4aBSfvsfmgjE9+xJta13 wD7QvYbZOo0YYCN6u3iw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nXGC2-00FelT-36; Thu, 24 Mar 2022 05:39:30 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nXGBf-00FedD-Ix; Thu, 24 Mar 2022 05:39:08 +0000 X-UUID: ce0433f4e753433f908213396df5ecc3-20220323 X-UUID: ce0433f4e753433f908213396df5ecc3-20220323 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 997539122; Wed, 23 Mar 2022 22:38:59 -0700 Received: from mtkmbs10n2.mediatek.inc (172.21.101.183) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 23 Mar 2022 22:38:58 -0700 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; Thu, 24 Mar 2022 13:38:56 +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; Thu, 24 Mar 2022 13:38:56 +0800 From: Trevor Wu To: , , , CC: , , , , , , , , , , Subject: [PATCH v4 4/6] ASoC: mediatek: mt8195: rename card controls Date: Thu, 24 Mar 2022 13:38:49 +0800 Message-ID: <20220324053851.27350-5-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220324053851.27350-1-trevor.wu@mediatek.com> References: <20220324053851.27350-1-trevor.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220323_223907_652169_3B63C280 X-CRM114-Status: GOOD ( 11.00 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Tzung-Bi Shih Reviewed-by: AngeloGioacchino Del Regno --- 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 879e17b0ffae..e45bd5d38cda 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -64,7 +64,7 @@ struct mt8195_mt6359_priv { }; static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] = { - 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), @@ -74,8 +74,8 @@ static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] = { static const struct snd_soc_dapm_route mt8195_mt6359_routes[] = { /* 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"}, @@ -90,35 +90,35 @@ static const struct snd_soc_dapm_route mt8195_mt6359_routes[] = { }; static const struct snd_kcontrol_new mt8195_mt6359_controls[] = { - SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("Headset Mic"), }; static const struct snd_soc_dapm_widget mt8195_dual_speaker_widgets[] = { - 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), }; static const struct snd_kcontrol_new mt8195_dual_speaker_controls[] = { - SOC_DAPM_PIN_SWITCH("Left Speaker"), - SOC_DAPM_PIN_SWITCH("Right Speaker"), + SOC_DAPM_PIN_SWITCH("Left Spk"), + SOC_DAPM_PIN_SWITCH("Right Spk"), }; static const struct snd_soc_dapm_widget mt8195_speaker_widgets[] = { - SND_SOC_DAPM_SPK("Speakers", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), }; static const struct snd_kcontrol_new mt8195_speaker_controls[] = { - SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Ext Spk"), }; static const struct snd_soc_dapm_route mt8195_rt1011_routes[] = { - { "Left Speaker", NULL, "Left SPO" }, - { "Right Speaker", NULL, "Right SPO" }, + { "Left Spk", NULL, "Left SPO" }, + { "Right Spk", NULL, "Right SPO" }, }; static const struct snd_soc_dapm_route mt8195_rt1019_routes[] = { - { "Speakers", NULL, "Speaker" }, + { "Ext Spk", NULL, "Speaker" }, }; #define CKSYS_AUD_TOP_CFG 0x032c