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

Commit 2436a723 authored by Misael Lopez Cruz's avatar Misael Lopez Cruz Committed by Mark Brown
Browse files

ASoC: core: Add helper for DAI widgets linking 



Add a helper for DAI widgets linking in preparation for
DAI-multicodec support.

No functional change.

Signed-off-by: default avatarMisael Lopez Cruz <misael.lopez@ti.com>
[fparent@baylibre.com: Adapt to 3.14+]
Signed-off-by: default avatarFabien Parent <fparent@baylibre.com>
Signed-off-by: default avatarBenoit Cousson <bcousson@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b0aa88af

sound/soc/soc-core.c

+40 −24
Original line number Diff line number Diff line
@@ -1413,6 +1413,42 @@ static int soc_probe_codec_dai(struct snd_soc_card *card, 
	return 0;

}



static int soc_link_dai_widgets(struct snd_soc_card *card,

				struct snd_soc_dai_link *dai_link,

				struct snd_soc_dai *cpu_dai,

				struct snd_soc_dai *codec_dai)

{

	struct snd_soc_dapm_widget *play_w, *capture_w;

	int ret;



	/* link the DAI widgets */

	play_w = codec_dai->playback_widget;

	capture_w = cpu_dai->capture_widget;

	if (play_w && capture_w) {

		ret = snd_soc_dapm_new_pcm(card, dai_link->params,

					   capture_w, play_w);

		if (ret != 0) {

			dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",

				play_w->name, capture_w->name, ret);

			return ret;

		}

	}



	play_w = cpu_dai->playback_widget;

	capture_w = codec_dai->capture_widget;

	if (play_w && capture_w) {

		ret = snd_soc_dapm_new_pcm(card, dai_link->params,

					   capture_w, play_w);

		if (ret != 0) {

			dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",

				play_w->name, capture_w->name, ret);

			return ret;

		}

	}



	return 0;

}



static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)

{

	struct snd_soc_dai_link *dai_link = &card->dai_link[num];
@@ -1421,7 +1457,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
	struct snd_soc_platform *platform = rtd->platform;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dapm_widget *play_w, *capture_w;

	int ret;



	dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n",
@@ -1502,31 +1537,12 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) 
						codec2codec_close_delayed_work);



			/* link the DAI widgets */

			play_w = codec_dai->playback_widget;

			capture_w = cpu_dai->capture_widget;

			if (play_w && capture_w) {

				ret = snd_soc_dapm_new_pcm(card, dai_link->params,

						   capture_w, play_w);

				if (ret != 0) {

					dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",

						play_w->name, capture_w->name, ret);

					return ret;

				}

			}



			play_w = cpu_dai->playback_widget;

			capture_w = codec_dai->capture_widget;

			if (play_w && capture_w) {

				ret = snd_soc_dapm_new_pcm(card, dai_link->params,

						   capture_w, play_w);

				if (ret != 0) {

					dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",

						play_w->name, capture_w->name, ret);

			ret = soc_link_dai_widgets(card, dai_link,

					cpu_dai, codec_dai);

			if (ret)

				return ret;

		}

	}

		}

	}



	/* add platform data for AC97 devices */

	if (rtd->codec_dai->driver->ac97_control)