aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-18 21:18:22 -0400
committerMark Brown <broonie@kernel.org>2019-06-19 07:55:15 -0400
commite562a5f13c9451e732d13b0a5ad58b6c99ccee8f (patch)
tree568f5056b79d2ce193359805acad259275a1233b
parentae7cbcc43b8c275b9f9b2491144110d260cd6b18 (diff)
ASoC: sirf: sirf-audio: don't select unnecessary Platform
ALSA SoC is now supporting "no Platform". Sound card doesn't need to select "CPU component" as "Platform" anymore if it doesn't need special Platform. This patch removes such settings. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sirf/sirf-audio.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/sirf/sirf-audio.c b/sound/soc/sirf/sirf-audio.c
index ba85ccf1fe19..eb29bca5d18f 100644
--- a/sound/soc/sirf/sirf-audio.c
+++ b/sound/soc/sirf/sirf-audio.c
@@ -63,8 +63,7 @@ static const struct snd_soc_dapm_route intercon[] = {
63/* Digital audio interface glue - connects codec <--> CPU */ 63/* Digital audio interface glue - connects codec <--> CPU */
64SND_SOC_DAILINK_DEFS(sirf, 64SND_SOC_DAILINK_DEFS(sirf,
65 DAILINK_COMP_ARRAY(COMP_EMPTY()), 65 DAILINK_COMP_ARRAY(COMP_EMPTY()),
66 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")), 66 DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")));
67 DAILINK_COMP_ARRAY(COMP_EMPTY()));
68 67
69static struct snd_soc_dai_link sirf_audio_dai_link[] = { 68static struct snd_soc_dai_link sirf_audio_dai_link[] = {
70 { 69 {
@@ -99,8 +98,6 @@ static int sirf_audio_probe(struct platform_device *pdev)
99 98
100 sirf_audio_dai_link[0].cpus->of_node = 99 sirf_audio_dai_link[0].cpus->of_node =
101 of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0); 100 of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
102 sirf_audio_dai_link[0].platforms->of_node =
103 of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
104 sirf_audio_dai_link[0].codecs->of_node = 101 sirf_audio_dai_link[0].codecs->of_node =
105 of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0); 102 of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0);
106 sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node, 103 sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node,