OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: rockchip: rockchip_rt5645: 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: 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:17:37 +09:00 committed by Mark Brown
parent e0d129d4ca
commit 0209bf2b2a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/soc/rockchip/rockchip_rt5645.c
View File

@ -135,15 +135,20 @@ static const struct snd_soc_ops rk_aif1_ops = {
.hw_params = rk_aif1_hw_params, .hw_params = rk_aif1_hw_params,
}; };
SND_SOC_DAILINK_DEFS(pcm,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5645-aif1")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link rk_dailink = { static struct snd_soc_dai_link rk_dailink = {
.name = "rt5645", .name = "rt5645",
.stream_name = "rt5645 PCM", .stream_name = "rt5645 PCM",
.codec_dai_name = "rt5645-aif1",
.init = rk_init, .init = rk_init,
.ops = &rk_aif1_ops, .ops = &rk_aif1_ops,
/* set rt5645 as slave */ /* set rt5645 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(pcm),
}; };
static struct snd_soc_card snd_soc_card_rk = { static struct snd_soc_card snd_soc_card_rk = {
@ -168,24 +173,24 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
/* register the soc card */ /* register the soc card */
card->dev = &pdev->dev; card->dev = &pdev->dev;
rk_dailink.codec_of_node = of_parse_phandle(np, rk_dailink.codecs->of_node = of_parse_phandle(np,
"rockchip,audio-codec", 0); "rockchip,audio-codec", 0);
if (!rk_dailink.codec_of_node) { if (!rk_dailink.codecs->of_node) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Property 'rockchip,audio-codec' missing or invalid\n"); "Property 'rockchip,audio-codec' missing or invalid\n");
return -EINVAL; return -EINVAL;
} }
rk_dailink.cpu_of_node = of_parse_phandle(np, rk_dailink.cpus->of_node = of_parse_phandle(np,
"rockchip,i2s-controller", 0); "rockchip,i2s-controller", 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");
ret = -EINVAL; ret = -EINVAL;
goto put_codec_of_node; goto put_codec_of_node;
} }
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_card_name(card, "rockchip,model"); ret = snd_soc_of_parse_card_name(card, "rockchip,model");
if (ret) { if (ret) {
@ -204,21 +209,21 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
return ret; return ret;
put_cpu_of_node: put_cpu_of_node:
of_node_put(rk_dailink.cpu_of_node); of_node_put(rk_dailink.cpus->of_node);
rk_dailink.cpu_of_node = NULL; rk_dailink.cpus->of_node = NULL;
put_codec_of_node: put_codec_of_node:
of_node_put(rk_dailink.codec_of_node); of_node_put(rk_dailink.codecs->of_node);
rk_dailink.codec_of_node = NULL; rk_dailink.codecs->of_node = NULL;
return ret; return ret;
} }
static int snd_rk_mc_remove(struct platform_device *pdev) static int snd_rk_mc_remove(struct platform_device *pdev)
{ {
of_node_put(rk_dailink.cpu_of_node); of_node_put(rk_dailink.cpus->of_node);
rk_dailink.cpu_of_node = NULL; rk_dailink.cpus->of_node = NULL;
of_node_put(rk_dailink.codec_of_node); of_node_put(rk_dailink.codecs->of_node);
rk_dailink.codec_of_node = NULL; rk_dailink.codecs->of_node = NULL;
return 0; return 0;
} }