Commit dc568f87 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai

Now that the platform driver is registered with the cpu_dai's device we
can use the same name/node for it.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 25bed461
...@@ -239,7 +239,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = { ...@@ -239,7 +239,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
.stream_name = "TWL4030 HiFi", .stream_name = "TWL4030 HiFi",
.cpu_dai_name = "omap-mcbsp.2", .cpu_dai_name = "omap-mcbsp.2",
.codec_dai_name = "twl4030-hifi", .codec_dai_name = "twl4030-hifi",
.platform_name = "omap-pcm-audio", .platform_name = "omap-mcbsp.2",
.codec_name = "twl4030-codec", .codec_name = "twl4030-codec",
.init = omap_twl4030_init, .init = omap_twl4030_init,
.ops = &omap_twl4030_ops, .ops = &omap_twl4030_ops,
...@@ -249,7 +249,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = { ...@@ -249,7 +249,7 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
.stream_name = "TWL4030 Voice", .stream_name = "TWL4030 Voice",
.cpu_dai_name = "omap-mcbsp.3", .cpu_dai_name = "omap-mcbsp.3",
.codec_dai_name = "twl4030-voice", .codec_dai_name = "twl4030-voice",
.platform_name = "omap-pcm-audio", .platform_name = "omap-mcbsp.2",
.codec_name = "twl4030-codec", .codec_name = "twl4030-codec",
.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBM_CFM, SND_SOC_DAIFMT_CBM_CFM,
...@@ -299,12 +299,18 @@ static int omap_twl4030_probe(struct platform_device *pdev) ...@@ -299,12 +299,18 @@ static int omap_twl4030_probe(struct platform_device *pdev)
omap_twl4030_dai_links[0].cpu_dai_name = NULL; omap_twl4030_dai_links[0].cpu_dai_name = NULL;
omap_twl4030_dai_links[0].cpu_of_node = dai_node; omap_twl4030_dai_links[0].cpu_of_node = dai_node;
omap_twl4030_dai_links[0].platform_name = NULL;
omap_twl4030_dai_links[0].platform_of_node = dai_node;
dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0); dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0);
if (!dai_node) { if (!dai_node) {
card->num_links = 1; card->num_links = 1;
} else { } else {
omap_twl4030_dai_links[1].cpu_dai_name = NULL; omap_twl4030_dai_links[1].cpu_dai_name = NULL;
omap_twl4030_dai_links[1].cpu_of_node = dai_node; omap_twl4030_dai_links[1].cpu_of_node = dai_node;
omap_twl4030_dai_links[1].platform_name = NULL;
omap_twl4030_dai_links[1].platform_of_node = dai_node;
} }
priv->jack_detect = of_get_named_gpio(node, priv->jack_detect = of_get_named_gpio(node,
......
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