Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 0209bf2b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e0d129d4

sound/soc/rockchip/rockchip_rt5645.c

+19 −14
Original line number Diff line number Diff line
@@ -135,15 +135,20 @@ static const struct snd_soc_ops rk_aif1_ops = { 
	.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 = {

	.name = "rt5645",

	.stream_name = "rt5645 PCM",

	.codec_dai_name = "rt5645-aif1",

	.init = rk_init,

	.ops = &rk_aif1_ops,

	/* set rt5645 as slave */

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		SND_SOC_DAIFMT_CBS_CFS,

	SND_SOC_DAILINK_REG(pcm),

};



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 */

	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);

	if (!rk_dailink.codec_of_node) {

	if (!rk_dailink.codecs->of_node) {

		dev_err(&pdev->dev,

			"Property 'rockchip,audio-codec' missing or invalid\n");

		return -EINVAL;

	}



	rk_dailink.cpu_of_node = of_parse_phandle(np,

	rk_dailink.cpus->of_node = of_parse_phandle(np,

			"rockchip,i2s-controller", 0);

	if (!rk_dailink.cpu_of_node) {

	if (!rk_dailink.cpus->of_node) {

		dev_err(&pdev->dev,

			"Property 'rockchip,i2s-controller' missing or invalid\n");

		ret = -EINVAL;

		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");

	if (ret) {
@@ -204,21 +209,21 @@ static int snd_rk_mc_probe(struct platform_device *pdev) 
	return ret;



put_cpu_of_node:

	of_node_put(rk_dailink.cpu_of_node);

	rk_dailink.cpu_of_node = NULL;

	of_node_put(rk_dailink.cpus->of_node);

	rk_dailink.cpus->of_node = NULL;

put_codec_of_node:

	of_node_put(rk_dailink.codec_of_node);

	rk_dailink.codec_of_node = NULL;

	of_node_put(rk_dailink.codecs->of_node);

	rk_dailink.codecs->of_node = NULL;



	return ret;

}



static int snd_rk_mc_remove(struct platform_device *pdev)

{

	of_node_put(rk_dailink.cpu_of_node);

	rk_dailink.cpu_of_node = NULL;

	of_node_put(rk_dailink.codec_of_node);

	rk_dailink.codec_of_node = NULL;

	of_node_put(rk_dailink.cpus->of_node);

	rk_dailink.cpus->of_node = NULL;

	of_node_put(rk_dailink.codecs->of_node);

	rk_dailink.codecs->of_node = NULL;



	return 0;

}