redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: tegra: tegra_sgtl5000: consider CPU-Platform possibility 

commit cee1cf3f9f ("ASoC: tegra: tegra_sgtl5000: 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 cee1cf3f9f ("ASoC: tegra: tegra_sgtl5000: don't select unnecessary Platform")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
alistair/sunxi64-5.4-dsi
Kuninori Morimoto 2019-06-28 10:48:58 +09:00 committed by Mark Brown
parent 1dd2e91b08
commit be2428f321
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/tegra/tegra_sgtl5000.c
View File

@ -83,7 +83,8 @@ static const struct snd_soc_dapm_widget tegra_sgtl5000_dapm_widgets[] = {
SND_SOC_DAILINK_DEFS(hifi,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sgtl5000")));
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sgtl5000")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link tegra_sgtl5000_dai = {
.name = "sgtl5000",
@ -145,6 +146,8 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
goto err_put_codec_of_node;
}
tegra_sgtl5000_dai.platforms->of_node = tegra_sgtl5000_dai.cpus->of_node;
ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
if (ret)
goto err_put_cpu_of_node;
@ -163,6 +166,7 @@ err_fini_utils:
err_put_cpu_of_node:
of_node_put(tegra_sgtl5000_dai.cpus->of_node);
tegra_sgtl5000_dai.cpus->of_node = NULL;
tegra_sgtl5000_dai.platforms->of_node = NULL;
err_put_codec_of_node:
of_node_put(tegra_sgtl5000_dai.codecs->of_node);
tegra_sgtl5000_dai.codecs->of_node = NULL;
@ -182,6 +186,7 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)
of_node_put(tegra_sgtl5000_dai.cpus->of_node);
tegra_sgtl5000_dai.cpus->of_node = NULL;
tegra_sgtl5000_dai.platforms->of_node = NULL;
of_node_put(tegra_sgtl5000_dai.codecs->of_node);
tegra_sgtl5000_dai.codecs->of_node = NULL;