xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: sirf: sirf-audio: use modern dai_link style

Browse Source 
ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto
2019-06-06 13:18:06 +09:00
committed by Mark Brown
parent 8d6975ea36
commit a39bb1b740
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/sirf/sirf-audio.c
View File

@@ -61,11 +61,16 @@ static const struct snd_soc_dapm_route intercon[] = {
}; };
/* Digital audio interface glue - connects codec <--> CPU */ /* 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()));
static struct snd_soc_dai_link sirf_audio_dai_link[] = { static struct snd_soc_dai_link sirf_audio_dai_link[] = {
{ {
.name = "SiRF audio card", .name = "SiRF audio card",
.stream_name = "SiRF audio HiFi", .stream_name = "SiRF audio HiFi",
.codec_dai_name = "sirf-audio-codec", SND_SOC_DAILINK_REG(sirf),
}, },
}; };
@@ -92,11 +97,11 @@ static int sirf_audio_probe(struct platform_device *pdev)
if (sirf_audio_card == NULL) if (sirf_audio_card == NULL)
return -ENOMEM; return -ENOMEM;
sirf_audio_dai_link[0].cpu_of_node = sirf_audio_dai_link[0].cpus->of_node =
of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0); of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
sirf_audio_dai_link[0].platform_of_node = sirf_audio_dai_link[0].platforms->of_node =
of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0); of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
sirf_audio_dai_link[0].codec_of_node = sirf_audio_dai_link[0].codecs->of_node =
of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0); 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, sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node,
"spk-pa-gpios", 0); "spk-pa-gpios", 0);