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

Commit 25bed461 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver 



Now that the platform driver is registered with the cpu_dai's device we
can use the same node for it instead of the hardwired name.
We can also remove the cpu_dai_name and platform_name from the dai_link
struct since we only support DT boot on OMAP4/5

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9769824c

sound/soc/omap/omap-abe-twl6040.c

+2 −6
Original line number Diff line number Diff line
@@ -214,9 +214,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = { 
	{

		.name = "TWL6040",

		.stream_name = "TWL6040",

		.cpu_dai_name = "omap-mcpdm",

		.codec_dai_name = "twl6040-legacy",

		.platform_name = "omap-pcm-audio",

		.codec_name = "twl6040-codec",

		.init = omap_abe_twl6040_init,

		.ops = &omap_abe_ops,
@@ -224,9 +222,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = { 
	{

		.name = "DMIC",

		.stream_name = "DMIC Capture",

		.cpu_dai_name = "omap-dmic",

		.codec_dai_name = "dmic-hifi",

		.platform_name = "omap-pcm-audio",

		.codec_name = "dmic-codec",

		.init = omap_abe_dmic_init,

		.ops = &omap_abe_dmic_ops,
@@ -281,14 +277,14 @@ static int omap_abe_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "McPDM node is not provided\n");

		return -EINVAL;

	}

	abe_twl6040_dai_links[0].cpu_dai_name  = NULL;

	abe_twl6040_dai_links[0].cpu_of_node = dai_node;

	abe_twl6040_dai_links[0].platform_of_node = dai_node;



	dai_node = of_parse_phandle(node, "ti,dmic", 0);

	if (dai_node) {

		num_links = 2;

		abe_twl6040_dai_links[1].cpu_dai_name  = NULL;

		abe_twl6040_dai_links[1].cpu_of_node = dai_node;

		abe_twl6040_dai_links[1].platform_of_node = dai_node;



		priv->dmic_codec_dev = platform_device_register_simple(

						"dmic-codec", -1, NULL, 0);