Unverified Commit 1306ab2e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ti: omap-abe-twl6040: don't select unnecessary Platform 



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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f46da1b9

sound/soc/ti/omap-abe-twl6040.c

+8 −14
Original line number Diff line number Diff line
@@ -35,17 +35,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;
@@ -270,9 +270,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;
@@ -286,9 +283,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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE