Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Jianhua Lu <lujianhua000@gmail.com>
To:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        Banajit Goswami <bgoswami@quicinc.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc:     alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
        linux-kernel@vger.kernel.org, Jianhua Lu <lujianhua000@gmail.com>
Subject: [PATCH v3 2/4] ASoC: qcom: sdm845: switch to qcom_snd_tdm_hw_params helper
Date:   Wed, 13 Dec 2023 20:35:54 +0800
Message-ID: <20231213123556.20469-2-lujianhua000@gmail.com>
In-Reply-To: <20231213123556.20469-1-lujianhua000@gmail.com>
References: <20231213123556.20469-1-lujianhua000@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Use qcom_snd_tdm_hw_params helper to setup TDM ports.

Signed-off-by: Jianhua Lu <lujianhua000@gmail.com>
---
Changes in v3:
  1. new patch

 sound/soc/qcom/sdm845.c | 46 +++++++----------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c
index 252a0f0819be..5052c1410723 100644
--- a/sound/soc/qcom/sdm845.c
+++ b/sound/soc/qcom/sdm845.c
@@ -53,8 +53,6 @@ static struct snd_soc_jack_pin sdm845_jack_pins[] = {
 	},
 };
 
-static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};
-
 static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream,
 				     struct snd_pcm_hw_params *params)
 {
@@ -99,10 +97,9 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
 					struct snd_pcm_hw_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
 	struct snd_soc_dai *codec_dai;
 	int ret = 0, j;
-	int channels, slot_width;
+	int slot_width;
 
 	switch (params_format(params)) {
 	case SNDRV_PCM_FORMAT_S16_LE:
@@ -114,39 +111,11 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
 		return -EINVAL;
 	}
 
-	channels = params_channels(params);
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0, 0x3,
-				8, slot_width);
-		if (ret < 0) {
-			dev_err(rtd->dev, "%s: failed to set tdm slot, err:%d\n",
-					__func__, ret);
-			goto end;
-		}
-
-		ret = snd_soc_dai_set_channel_map(cpu_dai, 0, NULL,
-				channels, tdm_slot_offset);
-		if (ret < 0) {
-			dev_err(rtd->dev, "%s: failed to set channel map, err:%d\n",
-					__func__, ret);
-			goto end;
-		}
-	} else {
-		ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0xf, 0,
-				8, slot_width);
-		if (ret < 0) {
-			dev_err(rtd->dev, "%s: failed to set tdm slot, err:%d\n",
-					__func__, ret);
-			goto end;
-		}
-
-		ret = snd_soc_dai_set_channel_map(cpu_dai, channels,
-				tdm_slot_offset, 0, NULL);
-		if (ret < 0) {
-			dev_err(rtd->dev, "%s: failed to set channel map, err:%d\n",
-					__func__, ret);
-			goto end;
-		}
+	ret = qcom_snd_tdm_hw_params(substream, params);
+	if (ret < 0) {
+		dev_err(rtd->dev, "%s: failed to setup TDM err:%d\n",
+			__func__, ret);
+		return ret;
 	}
 
 	for_each_rtd_codec_dais(rtd, j, codec_dai) {
@@ -176,8 +145,7 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
 		}
 	}
 
-end:
-	return ret;
+	return 0;
 }
 
 static int sdm845_snd_hw_params(struct snd_pcm_substream *substream,
-- 
2.41.0