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

Unverified Commit 9b4f646a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: tegra: tegra_rt5677: 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 f4010b4c

sound/soc/tegra/tegra_rt5677.c

+21 −16
Original line number Diff line number Diff line
@@ -169,14 +169,19 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



SND_SOC_DAILINK_DEFS(pcm,

	DAILINK_COMP_ARRAY(COMP_EMPTY()),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



static struct snd_soc_dai_link tegra_rt5677_dai = {

	.name = "RT5677",

	.stream_name = "RT5677 PCM",

	.codec_dai_name = "rt5677-aif1",

	.init = tegra_rt5677_asoc_init,

	.ops = &tegra_rt5677_ops,

	.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_tegra_rt5677 = {
@@ -249,24 +254,24 @@ static int tegra_rt5677_probe(struct platform_device *pdev) 
	if (ret)

		goto err;



	tegra_rt5677_dai.codec_of_node = of_parse_phandle(np,

	tegra_rt5677_dai.codecs->of_node = of_parse_phandle(np,

			"nvidia,audio-codec", 0);

	if (!tegra_rt5677_dai.codec_of_node) {

	if (!tegra_rt5677_dai.codecs->of_node) {

		dev_err(&pdev->dev,

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

		ret = -EINVAL;

		goto err;

	}



	tegra_rt5677_dai.cpu_of_node = of_parse_phandle(np,

	tegra_rt5677_dai.cpus->of_node = of_parse_phandle(np,

			"nvidia,i2s-controller", 0);

	if (!tegra_rt5677_dai.cpu_of_node) {

	if (!tegra_rt5677_dai.cpus->of_node) {

		dev_err(&pdev->dev,

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

		ret = -EINVAL;

		goto err_put_codec_of_node;

	}

	tegra_rt5677_dai.platform_of_node = tegra_rt5677_dai.cpu_of_node;

	tegra_rt5677_dai.platforms->of_node = tegra_rt5677_dai.cpus->of_node;



	ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);

	if (ret)
@@ -284,12 +289,12 @@ static int tegra_rt5677_probe(struct platform_device *pdev) 
err_fini_utils:

	tegra_asoc_utils_fini(&machine->util_data);

err_put_cpu_of_node:

	of_node_put(tegra_rt5677_dai.cpu_of_node);

	tegra_rt5677_dai.cpu_of_node = NULL;

	tegra_rt5677_dai.platform_of_node = NULL;

	of_node_put(tegra_rt5677_dai.cpus->of_node);

	tegra_rt5677_dai.cpus->of_node = NULL;

	tegra_rt5677_dai.platforms->of_node = NULL;

err_put_codec_of_node:

	of_node_put(tegra_rt5677_dai.codec_of_node);

	tegra_rt5677_dai.codec_of_node = NULL;

	of_node_put(tegra_rt5677_dai.codecs->of_node);

	tegra_rt5677_dai.codecs->of_node = NULL;

err:

	return ret;

}
@@ -303,11 +308,11 @@ static int tegra_rt5677_remove(struct platform_device *pdev) 


	tegra_asoc_utils_fini(&machine->util_data);



	tegra_rt5677_dai.platform_of_node = NULL;

	of_node_put(tegra_rt5677_dai.codec_of_node);

	tegra_rt5677_dai.codec_of_node = NULL;

	of_node_put(tegra_rt5677_dai.cpu_of_node);

	tegra_rt5677_dai.cpu_of_node = NULL;

	tegra_rt5677_dai.platforms->of_node = NULL;

	of_node_put(tegra_rt5677_dai.codecs->of_node);

	tegra_rt5677_dai.codecs->of_node = NULL;

	of_node_put(tegra_rt5677_dai.cpus->of_node);

	tegra_rt5677_dai.cpus->of_node = NULL;



	return 0;

}