diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-28 10:48:31 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-28 15:16:43 +0100 |
| commit | e22c32e1d41b69501ab04c1ec865eea606f7ebe2 (patch) | |
| tree | 7ed1a4f78d7fc6cf1cef7cfd04aece7ec6073425 /sound | |
| parent | 74a25f36ba7af991c1133a5ce75d8f0a65ed3c7c (diff) | |
| download | linux-e22c32e1d41b69501ab04c1ec865eea606f7ebe2.tar.bz2 | |
ASoC: sirf: sirf-audio: consider CPU-Platform possibility
commit e562a5f13c94 ("ASoC: sirf: sirf-audio: 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 e562a5f13c94 ("ASoC: sirf: sirf-audio: 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')
| -rw-r--r-- | sound/soc/sirf/sirf-audio.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/sirf/sirf-audio.c b/sound/soc/sirf/sirf-audio.c index 45ad23638bdc..c923b6772b22 100644 --- a/sound/soc/sirf/sirf-audio.c +++ b/sound/soc/sirf/sirf-audio.c @@ -62,7 +62,8 @@ static const struct snd_soc_dapm_route intercon[] = { /* Digital audio interface glue - connects codec <--> CPU */ SND_SOC_DAILINK_DEFS(sirf, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec"))); + DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); static struct snd_soc_dai_link sirf_audio_dai_link[] = { { @@ -97,6 +98,8 @@ static int sirf_audio_probe(struct platform_device *pdev) sirf_audio_dai_link[0].cpus->of_node = of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0); + sirf_audio_dai_link[0].platforms->of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0); sirf_audio_dai_link[0].codecs->of_node = of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0); sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node, |