diff options
| author | Kuninori Morimoto | 2019-06-28 03:49:10 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-06-28 16:18:36 +0200 |
| commit | e0aad4b74fba62893a28ce860a99531d05e1d5ef (patch) | |
| tree | 2fcac65f8429cbfc57e6e81c0167d44bde4da795 /sound/soc/tegra | |
| parent | ASoC: tegra: tegra_wm8903: consider CPU-Platform possibility (diff) | |
| download | kernel-qcow2-linux-e0aad4b74fba62893a28ce860a99531d05e1d5ef.tar.gz kernel-qcow2-linux-e0aad4b74fba62893a28ce860a99531d05e1d5ef.tar.xz kernel-qcow2-linux-e0aad4b74fba62893a28ce860a99531d05e1d5ef.zip | |
ASoC: tegra: tegra_wm9712: consider CPU-Platform possibility
commit 5d62677238e9 ("ASoC: tegra: tegra_wm9712: 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 5d62677238e9 ("ASoC: tegra: tegra_wm9712: 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_wm9712.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c index b5faf709cc84..b85bd9f89073 100644 --- a/sound/soc/tegra/tegra_wm9712.c +++ b/sound/soc/tegra/tegra_wm9712.c @@ -42,7 +42,8 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd) SND_SOC_DAILINK_DEFS(hifi, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi"))); + DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec", "wm9712-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link tegra_wm9712_dai = { .name = "AC97 HiFi", @@ -104,6 +105,8 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev) goto codec_unregister; } + tegra_wm9712_dai.platforms->of_node = tegra_wm9712_dai.cpus->of_node; + ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev); if (ret) goto codec_unregister; |