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

Unverified Commit 8337ef4f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: imx-spdif: 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 cf8c3ec8

sound/soc/fsl/imx-spdif.c

+15 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
{

	struct device_node *spdif_np, *np = pdev->dev.of_node;

	struct imx_spdif_data *data;

	struct snd_soc_dai_link_component *comp;

	int ret = 0;



	spdif_np = of_parse_phandle(np, "spdif-controller", 0);
@@ -25,17 +26,26 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
	}



	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	if (!data) {

	comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);

	if (!data || !comp) {

		ret = -ENOMEM;

		goto end;

	}



	data->dai.cpus		= &comp[0];

	data->dai.codecs	= &comp[1];

	data->dai.platforms	= &comp[2];



	data->dai.num_cpus	= 1;

	data->dai.num_codecs	= 1;

	data->dai.num_platforms	= 1;



	data->dai.name = "S/PDIF PCM";

	data->dai.stream_name = "S/PDIF PCM";

	data->dai.codec_dai_name = "snd-soc-dummy-dai";

	data->dai.codec_name = "snd-soc-dummy";

	data->dai.cpu_of_node = spdif_np;

	data->dai.platform_of_node = spdif_np;

	data->dai.codecs->dai_name = "snd-soc-dummy-dai";

	data->dai.codecs->name = "snd-soc-dummy";

	data->dai.cpus->of_node = spdif_np;

	data->dai.platforms->of_node = spdif_np;

	data->dai.playback_only = true;

	data->dai.capture_only = true;