diff options
| -rw-r--r-- | sound/soc/sirf/sirf-audio.c | 5 |
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 */ |
| 64 | SND_SOC_DAILINK_DEFS(sirf, | 64 | SND_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 | ||
| 69 | static struct snd_soc_dai_link sirf_audio_dai_link[] = { | 68 | static 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, |
