diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 10:49:06 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 15:18:26 +0100 |
| commit | e8efc3ff9f839e4d3275a491554b24f17d14aa53 (patch) | |
| tree | dbc2caeec2956fab9fc640946409ffc742423e65 /sound/soc/tegra | |
| parent | 9e4e02eae46cad3430b8f4c0a7a96a366c562e21 (diff) | |
| download | linux-stable-e8efc3ff9f839e4d3275a491554b24f17d14aa53.tar.gz linux-stable-e8efc3ff9f839e4d3275a491554b24f17d14aa53.tar.bz2 linux-stable-e8efc3ff9f839e4d3275a491554b24f17d14aa53.zip | |
ASoC: tegra: tegra_wm8903: consider CPU-Platform possibility
commit b28d98527157 ("ASoC: tegra: tegra_wm8903: 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 b28d98527157 ("ASoC: tegra: tegra_wm8903: 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/tegra_wm8903.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index e512e50dc534..6211dfda2195 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -197,7 +197,8 @@ static int tegra_wm8903_remove(struct snd_soc_card *card) SND_SOC_DAILINK_DEFS(hifi, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8903-hifi"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8903-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link tegra_wm8903_dai = { .name = "WM8903", @@ -324,6 +325,8 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev) goto err; } + tegra_wm8903_dai.platforms->of_node = tegra_wm8903_dai.cpus->of_node; + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); if (ret) goto err; |