Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f7b701 authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Mark Brown
Browse files

ASoC: core: add optional pcm_new callback for DAI driver 



During probe, DAIs can need to perform some actions that requests
the knowledge of the pcm runtime handle.
The callback is called during DAIs linking, after PCM device creation.
For instance this can be used to add relationship between a DAI pcm
control and the pcm device.

Signed-off-by: default avatarArnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c82dbe5c

include/sound/soc-dai.h

+3 −0
Original line number Diff line number Diff line
@@ -256,6 +256,9 @@ struct snd_soc_dai_driver { 
	int (*resume)(struct snd_soc_dai *dai);

	/* compress dai */

	int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num);

	/* Optional Callback used at pcm creation*/

	int (*pcm_new)(struct snd_soc_pcm_runtime *rtd,

		       struct snd_soc_dai *dai);

	/* DAI is also used for the control bus */

	bool bus_control;

sound/soc/soc-core.c

+28 −0
Original line number Diff line number Diff line
@@ -1593,6 +1593,27 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order) 
	return 0;

}



static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,

				struct snd_soc_pcm_runtime *rtd)

{

	int i, ret = 0;



	for (i = 0; i < num_dais; ++i) {

		struct snd_soc_dai_driver *drv = dais[i]->driver;



		if (!rtd->dai_link->no_pcm && drv->pcm_new)

			ret = drv->pcm_new(rtd, dais[i]);

		if (ret < 0) {

			dev_err(dais[i]->dev,

				"ASoC: Failed to bind %s with pcm device\n",

				dais[i]->name);

			return ret;

		}

	}



	return 0;

}



static int soc_link_dai_widgets(struct snd_soc_card *card,

				struct snd_soc_dai_link *dai_link,

				struct snd_soc_pcm_runtime *rtd)
@@ -1704,6 +1725,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card, 
				       dai_link->stream_name, ret);

				return ret;

			}

			ret = soc_link_dai_pcm_new(&cpu_dai, 1, rtd);

			if (ret < 0)

				return ret;

			ret = soc_link_dai_pcm_new(rtd->codec_dais,

						   rtd->num_codecs, rtd);

			if (ret < 0)

				return ret;

		} else {

			INIT_DELAYED_WORK(&rtd->delayed_work,

						codec2codec_close_delayed_work);