diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 03:49:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 16:18:45 +0200 |
| commit | db1572d43ffbbe2d161d3e7a8fd5295667e42107 (patch) | |
| tree | e30c74a71d0e6e4e4843891da5397af1198ef978 /sound/soc/tegra | |
| parent | ASoC: tegra: tegra_wm9712: consider CPU-Platform possibility (diff) | |
| download | linux-db1572d43ffbbe2d161d3e7a8fd5295667e42107.tar.xz linux-db1572d43ffbbe2d161d3e7a8fd5295667e42107.zip | |
ASoC: tegra: trimslice: consider CPU-Platform possibility
commit 567b374d9973 ("ASoC: tegra: trimslice: 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 567b374d9973 ("ASoC: tegra: trimslice: 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/tegra')
| -rw-r--r-- | sound/soc/tegra/trimslice.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c index 61e04a42eda3..3f67ddd13674 100644 --- a/sound/soc/tegra/trimslice.c +++ b/sound/soc/tegra/trimslice.c @@ -79,7 +79,8 @@ static const struct snd_soc_dapm_route trimslice_audio_map[] = { SND_SOC_DAILINK_DEFS(single_dsp, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic23-hifi"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "tlv320aic23-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link trimslice_tlv320aic23_dai = { .name = "TLV320AIC23", @@ -137,6 +138,9 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev) goto err; } + trimslice_tlv320aic23_dai.platforms->of_node = + trimslice_tlv320aic23_dai.cpus->of_node; + ret = tegra_asoc_utils_init(&trimslice->util_data, &pdev->dev); if (ret) goto err; |