aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-abe-twl6040.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
-rw-r--r--sound/soc/omap/omap-abe-twl6040.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 024dafc3e298..1a89e5b1be16 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -214,9 +214,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
214 { 214 {
215 .name = "TWL6040", 215 .name = "TWL6040",
216 .stream_name = "TWL6040", 216 .stream_name = "TWL6040",
217 .cpu_dai_name = "omap-mcpdm",
218 .codec_dai_name = "twl6040-legacy", 217 .codec_dai_name = "twl6040-legacy",
219 .platform_name = "omap-pcm-audio",
220 .codec_name = "twl6040-codec", 218 .codec_name = "twl6040-codec",
221 .init = omap_abe_twl6040_init, 219 .init = omap_abe_twl6040_init,
222 .ops = &omap_abe_ops, 220 .ops = &omap_abe_ops,
@@ -224,9 +222,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
224 { 222 {
225 .name = "DMIC", 223 .name = "DMIC",
226 .stream_name = "DMIC Capture", 224 .stream_name = "DMIC Capture",
227 .cpu_dai_name = "omap-dmic",
228 .codec_dai_name = "dmic-hifi", 225 .codec_dai_name = "dmic-hifi",
229 .platform_name = "omap-pcm-audio",
230 .codec_name = "dmic-codec", 226 .codec_name = "dmic-codec",
231 .init = omap_abe_dmic_init, 227 .init = omap_abe_dmic_init,
232 .ops = &omap_abe_dmic_ops, 228 .ops = &omap_abe_dmic_ops,
@@ -281,14 +277,14 @@ static int omap_abe_probe(struct platform_device *pdev)
281 dev_err(&pdev->dev, "McPDM node is not provided\n"); 277 dev_err(&pdev->dev, "McPDM node is not provided\n");
282 return -EINVAL; 278 return -EINVAL;
283 } 279 }
284 abe_twl6040_dai_links[0].cpu_dai_name = NULL;
285 abe_twl6040_dai_links[0].cpu_of_node = dai_node; 280 abe_twl6040_dai_links[0].cpu_of_node = dai_node;
281 abe_twl6040_dai_links[0].platform_of_node = dai_node;
286 282
287 dai_node = of_parse_phandle(node, "ti,dmic", 0); 283 dai_node = of_parse_phandle(node, "ti,dmic", 0);
288 if (dai_node) { 284 if (dai_node) {
289 num_links = 2; 285 num_links = 2;
290 abe_twl6040_dai_links[1].cpu_dai_name = NULL;
291 abe_twl6040_dai_links[1].cpu_of_node = dai_node; 286 abe_twl6040_dai_links[1].cpu_of_node = dai_node;
287 abe_twl6040_dai_links[1].platform_of_node = dai_node;
292 288
293 priv->dmic_codec_dev = platform_device_register_simple( 289 priv->dmic_codec_dev = platform_device_register_simple(
294 "dmic-codec", -1, NULL, 0); 290 "dmic-codec", -1, NULL, 0);