korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 17:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: simple-card: count DAI / link numbers as in order

Browse Source 
simple-card checks DT links 2 times. 1st is for counting DAIs / links
to allocating memory, 2nd is for detecting DAIs.
To detecting DAIs as CPU-dummy -> dummy-Codec order when DPCM case,
it uses loops 2 times at 2nd DT link check.
But it doesn't do it at 1st DT link check.

	for (li.cpu = 1; li.cpu >= 0; li.cpu--) {
		/*
		 * Detect all CPU first, and Detect all Codec 2n
		 *
		 * In Normal sound case, all DAIs are detected
		 * as "CPU-Codec".
		 *
		 * In DPCM sound case,
		 * all CPUs   are detected as "CPU-dummy", and
		 * all Codecs are detected as "dummy-Codec".
		 * To avoid random sub-device numbering,
		 * detect "dummy-Codec" in last;
		 */
		ret = simple_for_each_link(...);
		...
	}

To prepare supporting multi-CPU/Codec, and code cleanup,
this patch use same loop for 1st DT link check, too.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877dlu1tp2.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2021-03-26 12:26:33 +09:00 committed by Mark Brown
parent e9cbcf23a2
commit a6e8798061
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/soc/generic/simple-card.c
View File

@ -483,9 +483,17 @@ static int simple_count_noml(struct asoc_simple_priv *priv,
struct device_node *codec,
struct link_info *li, bool is_top)
{
li->dais++; /* CPU or Codec */
if (np != codec)
li->link++; /* CPU-Codec */
/*
* |CPU |Codec : turn
* CPU |Pass |return
* Codec |return|return
* np
*/
if (!li->cpu || np == codec)
return 0;
li->link += 1;
li->dais += 2;
return 0;
}
@ -495,10 +503,23 @@ static int simple_count_dpcm(struct asoc_simple_priv *priv,
struct device_node *codec,
struct link_info *li, bool is_top)
{
li->dais++; /* CPU or Codec */
li->link++; /* CPU-dummy or dummy-Codec */
if (np == codec)
/*
* |CPU |Codec : turn
* CPU |Pass |return
* Codec |return|Pass
* np
*/
if (li->cpu == (np == codec))
return 0;
if (li->cpu) {
li->link++; /* CPU-dummy */
li->dais++;
} else {
li->link++; /* dummy-Codec */
li->dais++;
li->conf++;
}
return 0;
}
@ -562,9 +583,10 @@ static void simple_get_dais_count(struct asoc_simple_priv *priv,
return;
}
simple_for_each_link(priv, li,
simple_count_noml,
simple_count_dpcm);
for (li->cpu = 1; li->cpu >= 0; li->cpu--)
simple_for_each_link(priv, li,
simple_count_noml,
simple_count_dpcm);
dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
li->link, li->dais, li->conf);