|
@@ -214,9 +214,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
|
|
{
|
|
{
|
|
.name = "TWL6040",
|
|
.name = "TWL6040",
|
|
.stream_name = "TWL6040",
|
|
.stream_name = "TWL6040",
|
|
- .cpu_dai_name = "omap-mcpdm",
|
|
|
|
.codec_dai_name = "twl6040-legacy",
|
|
.codec_dai_name = "twl6040-legacy",
|
|
- .platform_name = "omap-pcm-audio",
|
|
|
|
.codec_name = "twl6040-codec",
|
|
.codec_name = "twl6040-codec",
|
|
.init = omap_abe_twl6040_init,
|
|
.init = omap_abe_twl6040_init,
|
|
.ops = &omap_abe_ops,
|
|
.ops = &omap_abe_ops,
|
|
@@ -224,9 +222,7 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = {
|
|
{
|
|
{
|
|
.name = "DMIC",
|
|
.name = "DMIC",
|
|
.stream_name = "DMIC Capture",
|
|
.stream_name = "DMIC Capture",
|
|
- .cpu_dai_name = "omap-dmic",
|
|
|
|
.codec_dai_name = "dmic-hifi",
|
|
.codec_dai_name = "dmic-hifi",
|
|
- .platform_name = "omap-pcm-audio",
|
|
|
|
.codec_name = "dmic-codec",
|
|
.codec_name = "dmic-codec",
|
|
.init = omap_abe_dmic_init,
|
|
.init = omap_abe_dmic_init,
|
|
.ops = &omap_abe_dmic_ops,
|
|
.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");
|
|
dev_err(&pdev->dev, "McPDM node is not provided\n");
|
|
return -EINVAL;
|
|
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].cpu_of_node = dai_node;
|
|
|
|
+ abe_twl6040_dai_links[0].platform_of_node = dai_node;
|
|
|
|
|
|
dai_node = of_parse_phandle(node, "ti,dmic", 0);
|
|
dai_node = of_parse_phandle(node, "ti,dmic", 0);
|
|
if (dai_node) {
|
|
if (dai_node) {
|
|
num_links = 2;
|
|
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].cpu_of_node = dai_node;
|
|
|
|
+ abe_twl6040_dai_links[1].platform_of_node = dai_node;
|
|
|
|
|
|
priv->dmic_codec_dev = platform_device_register_simple(
|
|
priv->dmic_codec_dev = platform_device_register_simple(
|
|
"dmic-codec", -1, NULL, 0);
|
|
"dmic-codec", -1, NULL, 0);
|