Unverified Commit ca39fab8 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: grace time for DPCM cleanup 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

As we discussed in [1], we don't need to use dpcm_playback/capture flag,
so we remove it. But we have been using it for 10 years, some driver might
get damage. The most likely case is that the device/driver can use both
playback/capture, but have only one flag, and not using xxx_only flag.
[1/3] patch indicates warning in such case.

These adds grace time for DPCM cleanup.
I'm not sure when dpcm_xxx will be removed, and Codec check bypass will be
error, but maybe v6.12 or v6.13 ?
Please check each driver by that time.

Previous patch-set try to check both CPU and Codec in DPCM, but we noticed
that there are some special DAI which we can't handle today [2]. So I will
escape it in this patch-set.

[1] https://lore.kernel.org/r/87edaym2cg.wl-kuninori.morimoto.gx@renesas.com
[2] https://lore.kernel.org/all/3e67d62d-fe08-4f55-ab5b-ece8a57154f9@linux.intel.com/

Link: https://lore.kernel.org/r/87edaym2cg.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87wmo6dyxg.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87msole5wc.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/871q5tnuok.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87bk4oqerx.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/8734pctmte.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87r0ctwzr4.wl-kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87cymvlmki.wl-kuninori.morimoto.gx@renesas.com
parents 90dc34da 61e1f74f

include/sound/soc-dai.h

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); 
int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int num);

bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int stream);

void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link);

void snd_soc_dai_action(struct snd_soc_dai *dai,

			int stream, int action);

static inline void snd_soc_dai_activate(struct snd_soc_dai *dai,

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ struct snd_soc_dai_link { 
	/* This DAI link can route to other DAI links at runtime (Frontend)*/

	unsigned int dynamic:1;



	/* REMOVE ME */

	/* DPCM capture and Playback support */

	unsigned int dpcm_capture:1;

	unsigned int dpcm_playback:1;

sound/soc/fsl/imx-card.c

+0 −3
Original line number Diff line number Diff line
@@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data) 
			link->ops = &imx_aif_ops;

		}



		if (link->no_pcm || link->dynamic)

			snd_soc_dai_link_set_capabilities(link);



		/* Get dai fmt */

		ret = simple_util_parse_daifmt(dev, np, codec,

					       NULL, &link->dai_fmt);

sound/soc/generic/audio-graph-card.c

+0 −2
Original line number Diff line number Diff line
@@ -279,8 +279,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, 


	graph_parse_convert(dev, ep, &dai_props->adata);



	snd_soc_dai_link_set_capabilities(dai_link);



	ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name);



	li->link++;

sound/soc/generic/audio-graph-card2.c

+0 −2
Original line number Diff line number Diff line
@@ -966,8 +966,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv, 
	graph_parse_convert(ep,  dai_props); /* at node of <dpcm> */

	graph_parse_convert(rep, dai_props); /* at node of <CPU/Codec> */



	snd_soc_dai_link_set_capabilities(dai_link);



	graph_link_init(priv, lnk, cpu_port, codec_port, li, is_cpu);

err:

	of_node_put(ep);