From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 5E2A422157E; Thu, 17 Apr 2025 08:44:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744879480; cv=none; b=qo22zr1EEMTtME6vl50zeRtwhhgSjiFII9MDbutyOaTNhNS1XPHymrzgGe/ZKL2JKtlq8MclmAXMA4cJw/xU0qkzcOQJySvG+U2GH4uzXutfhik4+Q+NFM90J58kyFXP4Aw5QCYKhQnoZVLNZVzkNoCJNWuNlJ7Uhk2eWZm1qOQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744879480; c=relaxed/simple; bh=rqpmpGxXSGELcHRBTPCV1yQQmzMmHIT+7KC+3I/Dg/E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XlYob5YUTmjbtsAbvaMn4vsRz5MAWicaTRBuY+MOzxsTmz24vQp7Z1CUbqeUFot7Zx1N1M7m/V/ZogiFKZ4VFQrE/nD8o1rO+m3Db/hnjBjLgg0q0GMkho/jYn8ODbw+4YymETR7vrLBce2+DimG3PYvD3uYWwDfSJPpMllZMoQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=g0DZUto7; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="g0DZUto7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879476; bh=rqpmpGxXSGELcHRBTPCV1yQQmzMmHIT+7KC+3I/Dg/E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=g0DZUto7oinMejVddqxdiSlIz8jM0b6HaiX7wY4U5JyCrtSl41eiPvibCv0HwHc3W Mv/j1k5NtEpz+lmQJYfdvRsLOzeuAUdFG0I5xJkt7jFpNpT0fZGqrvbrCwXv18Aurr CnAGxzJkvASl95Y7sxujh5K8SMBgclJAxYhsgtcvoqat2cxclo4aC/5E7uEi0EjBfK LoS3z6AVSVqRSWikAYUUlksMFUQ/XwD/W4ItD4wyYCE0g3GXmkFYqWnVmk1vKV+yhQ pS6WL60kOwdDrXk+kXncNkqlwh5q24OnB2kNOO6djkvFUdLUvYLJu/CtHPEheMwHHo pS6lUfnwkwsZg== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (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) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 992CF17E10F7; Thu, 17 Apr 2025 10:44:35 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:32 +0200 Subject: [PATCH 1/6] ASoC: mediatek: mt8195: Move rt5682 specific dapm routes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250417-mt8395-audio-sof-v1-1-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 'HPOL', 'HPOR', and 'Headset Mic' are rt5682 specific, move these routes to mt8195_rt5682_init so we keep 'mt8195_rt5682_routes' for connection between mt8195 and mt6359. Signed-off-by: Julien Massot --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index df29a9fa5aee5b6aedf34972cdf53402366d2ac2..f0bb59cf581b1e3bcfa66406d31de446a917c6c6 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -92,10 +92,6 @@ static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] = { }; static const struct snd_soc_dapm_route mt8195_mt6359_routes[] = { - /* headset */ - { "Headphone", NULL, "HPOL" }, - { "Headphone", NULL, "HPOR" }, - { "IN1P", NULL, "Headset Mic" }, /* SOF Uplink */ {SOF_DMA_UL4, NULL, "O034"}, {SOF_DMA_UL4, NULL, "O035"}, @@ -131,6 +127,13 @@ static const struct snd_kcontrol_new mt8195_speaker_controls[] = { SOC_DAPM_PIN_SWITCH("Ext Spk"), }; +static const struct snd_soc_dapm_route mt8195_rt5682_routes[] = { + /* headset */ + { "Headphone", NULL, "HPOL" }, + { "Headphone", NULL, "HPOR" }, + { "IN1P", NULL, "Headset Mic" }, +}; + static const struct snd_soc_dapm_route mt8195_rt1011_routes[] = { { "Left Spk", NULL, "Left SPO" }, { "Right Spk", NULL, "Right SPO" }, @@ -447,6 +450,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8195_afe_private *afe_priv = afe->platform_priv; + struct snd_soc_card *card = rtd->card; int ret; priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2]; @@ -473,7 +477,12 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) return ret; } - return 0; + ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt5682_routes, + ARRAY_SIZE(mt8195_rt5682_routes)); + if (ret) + dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); + + return ret; }; static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream, -- 2.49.0