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

ASoC: Intel: sof_sdw: add dai parameter to rtd_init callback 



A generic .rtd_init() callback could be used by different dais. It is
useful to pass dai parameter to the callback. The dai parameter will be
used in the follow up commit. No functional change here.

Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
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>
Link: https://lore.kernel.org/r/20240509163418.67746-18-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -1411,7 +1411,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd) 


skip_add_controls_widgets:

		if (codec_info->dais[dai_index].rtd_init) {

			ret = codec_info->dais[dai_index].rtd_init(rtd);

			ret = codec_info->dais[dai_index].rtd_init(rtd, dai);

			if (ret)

				return ret;

		}

sound/soc/intel/boards/sof_sdw_common.h

+15 −15
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct sof_sdw_dai_info { 
		     struct sof_sdw_codec_info *info,

		     bool playback);

	int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd);

	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

	bool rtd_init_done; /* Indicate that the rtd_init callback is done */

	unsigned long quirk;

};
@@ -208,19 +208,19 @@ int sof_sdw_cs_amp_init(struct snd_soc_card *card, 


/* dai_link init callbacks */



int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd);

int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd);

int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);

int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd);

int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd);

int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);

int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);



#endif

sound/soc/intel/boards/sof_sdw_cs42l42.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static const char * const jack_codecs[] = { 
	"cs42l42"

};



int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)

int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	struct mc_private *ctx = snd_soc_card_get_drvdata(card);

sound/soc/intel/boards/sof_sdw_cs42l43.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = { 
	},

};



int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)

int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;

	struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);
@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd) 
	return ret;

}



int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)

int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	int ret;
@@ -135,7 +135,7 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, 
	return bridge_cs35l56_spk_init(card, dai_links, info, playback);

}



int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)

int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	struct snd_soc_card *card = rtd->card;

	int ret;

sound/soc/intel/boards/sof_sdw_cs_amp.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#define CODEC_NAME_SIZE	8



int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)

int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)

{

	const char *dai_name = rtd->dai_link->codecs->dai_name;

	struct snd_soc_card *card = rtd->card;