Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: simple-card-utils: consider CPU-Platform possibility

Browse Source 
commit 6f04374457 ("ASoC: simple-card-utils: don't select unnecessary
Platform")

Current ALSA SoC avoid to add duplicate component to rtd,
and this driver was selecting CPU component as Platform component.
Thus, above patch removed Platform settings from this driver,
because it assumed these are same component.

But, some CPU driver is using generic DMAEngine, in such case, both
CPU component and Platform component will have same of_node/name.
In other words, there are some components which are different but
have same of_node/name.

In such case, Card driver definitely need to select Platform even
though it is same as CPU.
It is depends on CPU driver, but is difficult to know it from Card driver.
This patch reverts above patch.

Fixes: commit 6f04374457 ("ASoC: simple-card-utils: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-28 10:49:44 +09:00 committed by Mark Brown
parent 0296de83a6
commit 9f3eb91753
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/generic/simple-card-utils.c
View File

@ -346,18 +346,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_dai_init);
void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link) void asoc_simple_canonicalize_platform(struct snd_soc_dai_link *dai_link)
{ {
/* /* Assumes platform == cpu */
* no Platform if (!dai_link->platforms->of_node)
* dai_link->platforms->of_node = dai_link->cpus->of_node;
* It will be waste of memory, but not be memory leak.
* see
* asoc_simple_init_priv()
* asoc_simple_priv
*/
if (!dai_link->platforms->of_node) {
dai_link->platforms = NULL;
dai_link->num_platforms = 0;
}
} }
EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform); EXPORT_SYMBOL_GPL(asoc_simple_canonicalize_platform);