Commit bc9dfc4c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: ti: omap-abe-twl6040: 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 3b785a63
...@@ -35,6 +35,18 @@ ...@@ -35,6 +35,18 @@
#include "omap-mcpdm.h" #include "omap-mcpdm.h"
#include "../codecs/twl6040.h" #include "../codecs/twl6040.h"
SND_SOC_DAILINK_DEFS(link0,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC("twl6040-codec",
"twl6040-legacy")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(link1,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec",
"dmic-hifi")),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
struct abe_twl6040 { struct abe_twl6040 {
struct snd_soc_card card; struct snd_soc_card card;
struct snd_soc_dai_link dai_links[2]; struct snd_soc_dai_link dai_links[2];
...@@ -255,10 +267,14 @@ static int omap_abe_probe(struct platform_device *pdev) ...@@ -255,10 +267,14 @@ static int omap_abe_probe(struct platform_device *pdev)
priv->dai_links[0].name = "DMIC"; priv->dai_links[0].name = "DMIC";
priv->dai_links[0].stream_name = "TWL6040"; priv->dai_links[0].stream_name = "TWL6040";
priv->dai_links[0].cpu_of_node = dai_node; priv->dai_links[0].cpus = link0_cpus;
priv->dai_links[0].platform_of_node = dai_node; priv->dai_links[0].num_cpus = 1;
priv->dai_links[0].codec_dai_name = "twl6040-legacy"; priv->dai_links[0].cpus->of_node = dai_node;
priv->dai_links[0].codec_name = "twl6040-codec"; priv->dai_links[0].platforms = link0_platforms;
priv->dai_links[0].num_platforms = 1;
priv->dai_links[0].platforms->of_node = dai_node;
priv->dai_links[0].codecs = link0_codecs;
priv->dai_links[0].num_codecs = 1;
priv->dai_links[0].init = omap_abe_twl6040_init; priv->dai_links[0].init = omap_abe_twl6040_init;
priv->dai_links[0].ops = &omap_abe_ops; priv->dai_links[0].ops = &omap_abe_ops;
...@@ -267,10 +283,14 @@ static int omap_abe_probe(struct platform_device *pdev) ...@@ -267,10 +283,14 @@ static int omap_abe_probe(struct platform_device *pdev)
num_links = 2; num_links = 2;
priv->dai_links[1].name = "TWL6040"; priv->dai_links[1].name = "TWL6040";
priv->dai_links[1].stream_name = "DMIC Capture"; priv->dai_links[1].stream_name = "DMIC Capture";
priv->dai_links[1].cpu_of_node = dai_node; priv->dai_links[1].cpus = link1_cpus;
priv->dai_links[1].platform_of_node = dai_node; priv->dai_links[1].num_cpus = 1;
priv->dai_links[1].codec_dai_name = "dmic-hifi"; priv->dai_links[1].cpus->of_node = dai_node;
priv->dai_links[1].codec_name = "dmic-codec"; priv->dai_links[1].platforms = link1_platforms;
priv->dai_links[1].num_platforms = 1;
priv->dai_links[1].platforms->of_node = dai_node;
priv->dai_links[1].codecs = link1_codecs;
priv->dai_links[1].num_codecs = 1;
priv->dai_links[1].init = omap_abe_dmic_init; priv->dai_links[1].init = omap_abe_dmic_init;
priv->dai_links[1].ops = &omap_abe_dmic_ops; priv->dai_links[1].ops = &omap_abe_dmic_ops;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment