diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 10:48:58 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-06-28 15:18:06 +0100 |
| commit | be2428f3219c4eb32655a3e0db3f28d46e9d7986 (patch) | |
| tree | 87cb61bfba702a6499888aa695d24903ae9db948 /sound/soc | |
| parent | ASoC: tegra: tegra_rt5677: consider CPU-Platform possibility (diff) | |
| download | linux-dev-be2428f3219c4eb32655a3e0db3f28d46e9d7986.tar.xz linux-dev-be2428f3219c4eb32655a3e0db3f28d46e9d7986.zip | |
ASoC: tegra: tegra_sgtl5000: consider CPU-Platform possibility
commit cee1cf3f9f9e ("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 cee1cf3f9f9e ("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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/tegra/tegra_sgtl5000.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c index 07504a2a7afc..e13b81d29cf3 100644 --- a/sound/soc/tegra/tegra_sgtl5000.c +++ b/sound/soc/tegra/tegra_sgtl5000.c @@ -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; |