summaryrefslogtreecommitdiff
path: root/sound/soc/sirf
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 04:18:22 +0300
committerMark Brown <broonie@kernel.org>2019-06-19 14:55:15 +0300
commite562a5f13c9451e732d13b0a5ad58b6c99ccee8f (patch)
tree568f5056b79d2ce193359805acad259275a1233b /sound/soc/sirf
parentae7cbcc43b8c275b9f9b2491144110d260cd6b18 (diff)
downloadlinux-e562a5f13c9451e732d13b0a5ad58b6c99ccee8f.tar.xz
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>
Diffstat (limited to 'sound/soc/sirf')
-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[] = {
/* 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_EMPTY()));
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")));
static struct snd_soc_dai_link sirf_audio_dai_link[] = {
{
@@ -99,8 +98,6 @@ 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,