Commit e0d129d4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: rockchip: rk3288_hdmi_analog: use modern dai_link style

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 96a239b7
...@@ -151,24 +151,21 @@ static const struct snd_soc_ops rk_ops = { ...@@ -151,24 +151,21 @@ static const struct snd_soc_ops rk_ops = {
.hw_params = rk_hw_params, .hw_params = rk_hw_params,
}; };
static struct snd_soc_dai_link_component rk_codecs[] = { SND_SOC_DAILINK_DEFS(audio,
{ }, DAILINK_COMP_ARRAY(COMP_EMPTY()),
{ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, NULL),
.name = "hdmi-audio-codec.2.auto", COMP_CODEC("hdmi-audio-codec.2.auto", "i2s-hifi")),
.dai_name = "i2s-hifi", DAILINK_COMP_ARRAY(COMP_EMPTY()));
},
};
static struct snd_soc_dai_link rk_dailink = { static struct snd_soc_dai_link rk_dailink = {
.name = "Codecs", .name = "Codecs",
.stream_name = "Audio", .stream_name = "Audio",
.init = rk_init, .init = rk_init,
.ops = &rk_ops, .ops = &rk_ops,
.codecs = rk_codecs,
.num_codecs = ARRAY_SIZE(rk_codecs),
/* Set codecs as slave */ /* Set codecs as slave */
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
SND_SOC_DAILINK_REG(audio),
}; };
static struct snd_soc_card snd_soc_card_rk = { static struct snd_soc_card snd_soc_card_rk = {
...@@ -244,15 +241,15 @@ static int snd_rk_mc_probe(struct platform_device *pdev) ...@@ -244,15 +241,15 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
return ret; return ret;
} }
rk_dailink.cpu_of_node = of_parse_phandle(np, "rockchip,i2s-controller", rk_dailink.cpus->of_node = of_parse_phandle(np, "rockchip,i2s-controller",
0); 0);
if (!rk_dailink.cpu_of_node) { if (!rk_dailink.cpus->of_node) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Property 'rockchip,i2s-controller' missing or invalid\n"); "Property 'rockchip,i2s-controller' missing or invalid\n");
return -EINVAL; return -EINVAL;
} }
rk_dailink.platform_of_node = rk_dailink.cpu_of_node; rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;
ret = snd_soc_of_parse_audio_routing(card, "rockchip,routing"); ret = snd_soc_of_parse_audio_routing(card, "rockchip,routing");
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment