Unverified Commit f0c8d83a authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: start set codec init function with an adr index 



Currently, set_codec_init_func always start with link->adr_d[0] because
we assumed all adr_d on the same link are the same devices. The
assumption is no longer valid when different devices on the same sdw link
are supported.

Fixes: c8db7b50 ("ASoC: Intel: sof_sdw: support different devices on the same sdw link")
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20230512173305.65399-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b06e33aa

sound/soc/intel/boards/sof_sdw.c

+11 −5
Original line number Diff line number Diff line
@@ -910,17 +910,20 @@ static int create_codec_dai_name(struct device *dev, 
static int set_codec_init_func(struct snd_soc_card *card,

			       const struct snd_soc_acpi_link_adr *link,

			       struct snd_soc_dai_link *dai_links,

			       bool playback, int group_id)

			       bool playback, int group_id, int adr_index)

{

	int i;

	int i = adr_index;



	do {

		/*

		 * Initialize the codec. If codec is part of an aggregated

		 * group (group_id>0), initialize all codecs belonging to

		 * same group.

		 * The first link should start with link->adr_d[adr_index]

		 * because that is the device that we want to initialize and

		 * we should end immediately if it is not aggregated (group_id=0)

		 */

		for (i = 0; i < link->num_adr; i++) {

		for ( ; i < link->num_adr; i++) {

			int codec_index;



			codec_index = find_codec_info_part(link->adr_d[i].adr);
@@ -936,9 +939,12 @@ static int set_codec_init_func(struct snd_soc_card *card, 
						dai_links,

						&codec_info_list[codec_index],

						playback);

			if (!group_id)

				return 0;

		}

		i = 0;

		link++;

	} while (link->mask && group_id);

	} while (link->mask);



	return 0;

}
@@ -1188,7 +1194,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
		dai_links[*link_index].nonatomic = true;



		ret = set_codec_init_func(card, link, dai_links + (*link_index)++,

					  playback, group_id);

					  playback, group_id, adr_index);

		if (ret < 0) {

			dev_err(dev, "failed to init codec %d", codec_index);

			return ret;