Unverified Commit 46fb727a authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: amlogic: do not use dpcm_playback/capture flags 



dpcm_playback/capture flags are being deprecated in ASoC.
Use playback/capture_only flags instead

Suggested-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://patch.msgid.link/87plq2aahb.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/meson/axg-card.c

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, 
	lb->stream_name = lb->name;

	lb->cpus->of_node = pad->cpus->of_node;

	lb->cpus->dai_name = "TDM Loopback";

	lb->dpcm_capture = 1;

	lb->capture_only = 1;

	lb->no_pcm = 1;

	lb->ops = &axg_card_tdm_be_ops;

	lb->init = axg_card_tdm_dai_lb_init;
@@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, 


	/* Disable playback is the interface has no tx slots */

	if (!tx)

		link->dpcm_playback = 0;

		link->capture_only = 1;



	for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) {

		snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i);
@@ -186,9 +186,9 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, 


	/* Disable capture is the interface has no rx slots */

	if (!rx)

		link->dpcm_capture = 0;

		link->playback_only = 1;



	/* ... but the interface should at least have one of them */

	/* ... but the interface should at least have one direction */

	if (!tx && !rx) {

		dev_err(card->dev, "tdm link has no cpu slots\n");

		return -EINVAL;
@@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card, 
		return ret;



	/* Add loopback if the pad dai has playback */

	if (link->dpcm_playback) {

	if (!link->capture_only) {

		ret = axg_card_add_tdm_loopback(card, index);

		if (ret)

			return ret;

sound/soc/meson/meson-card-utils.c

+2 −2
Original line number Diff line number Diff line
@@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card, 
	link->dpcm_merged_rate = 1;



	if (is_playback)

		link->dpcm_playback = 1;

		link->playback_only = 1;

	else

		link->dpcm_capture = 1;

		link->capture_only = 1;



	return meson_card_set_link_name(card, link, node, "fe");

}