kevin/linux
1
Fork 0
Code

ASoC: Intel: sof_sdw_rt_amp: use dai parameter

Browse Source 
get_codec_name_and_route() get dai name from the first codec dai in a dai
link. However, the dai may not always be the first codec dai. Use the
dai parameter to make sure get_codec_name_and_route() refers to the
correct dai.

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-19-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2024-05-09 11:34:18 -05:00 committed by Mark Brown
parent 84e0a19adb
commit 4c11132a88
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/intel/boards/sof_sdw_rt_amp.c
View File

@ -158,15 +158,11 @@ static const struct snd_soc_dapm_route rt1318_map[] = {
{ "Speaker", NULL, "rt1318-2 SPOR" }, { "Speaker", NULL, "rt1318-2 SPOR" },
}; };
static const struct snd_soc_dapm_route *get_codec_name_and_route(struct snd_soc_pcm_runtime *rtd, static const struct snd_soc_dapm_route *get_codec_name_and_route(struct snd_soc_dai *dai,
char *codec_name) char *codec_name)
{ {
const char *dai_name;
dai_name = rtd->dai_link->codecs->dai_name;
/* get the codec name */ /* get the codec name */
snprintf(codec_name, CODEC_NAME_SIZE, "%s", dai_name); snprintf(codec_name, CODEC_NAME_SIZE, "%s", dai->name);
/* choose the right codec's map */ /* choose the right codec's map */
if (strcmp(codec_name, "rt1308") == 0) if (strcmp(codec_name, "rt1308") == 0)
@ -186,7 +182,7 @@ int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai
int ret; int ret;
int i; int i;
rt_amp_map = get_codec_name_and_route(rtd, codec_name); rt_amp_map = get_codec_name_and_route(dai, codec_name);
card->components = devm_kasprintf(card->dev, GFP_KERNEL, card->components = devm_kasprintf(card->dev, GFP_KERNEL,
"%s spk:%s", "%s spk:%s",