From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
sound/soc/ti/omap-abe-twl6040.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/sound/soc/ti/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c
index 6d564ab..5572f5a 100644
--- a/sound/soc/ti/omap-abe-twl6040.c
+++ b/sound/soc/ti/omap-abe-twl6040.c
@@ -21,17 +21,17 @@
#include "omap-mcpdm.h"
#include "../codecs/twl6040.h"
-SND_SOC_DAILINK_DEFS(link0,
- DAILINK_COMP_ARRAY(COMP_EMPTY()),
- DAILINK_COMP_ARRAY(COMP_CODEC("twl6040-codec",
- "twl6040-legacy")),
+SND_SOC_DAILINK_DEF(link0_cpus,
DAILINK_COMP_ARRAY(COMP_EMPTY()));
+SND_SOC_DAILINK_DEF(link0_codecs,
+ DAILINK_COMP_ARRAY(COMP_CODEC("twl6040-codec",
+ "twl6040-legacy")));
-SND_SOC_DAILINK_DEFS(link1,
- DAILINK_COMP_ARRAY(COMP_EMPTY()),
- DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec",
- "dmic-hifi")),
+SND_SOC_DAILINK_DEF(link1_cpus,
DAILINK_COMP_ARRAY(COMP_EMPTY()));
+SND_SOC_DAILINK_DEF(link1_codecs,
+ DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec",
+ "dmic-hifi")));
struct abe_twl6040 {
struct snd_soc_card card;
@@ -256,9 +256,6 @@ static int omap_abe_probe(struct platform_device *pdev)
priv->dai_links[0].cpus = link0_cpus;
priv->dai_links[0].num_cpus = 1;
priv->dai_links[0].cpus->of_node = dai_node;
- 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;
@@ -272,9 +269,6 @@ static int omap_abe_probe(struct platform_device *pdev)
priv->dai_links[1].cpus = link1_cpus;
priv->dai_links[1].num_cpus = 1;
priv->dai_links[1].cpus->of_node = dai_node;
- 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;
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
