]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ASoC: sirf: sirf-audio: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:18:22 +0000 (10:18 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:55:15 +0000 (12:55 +0100)
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>
sound/soc/sirf/sirf-audio.c

index ba85ccf1fe19443b26a263897d0bab5184b42b49..eb29bca5d18f29a5aa873a49c774a50263e0963b 100644 (file)
@@ -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,