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

ASoC: ti: omap-twl4030: 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 edba13ae

sound/soc/ti/omap-twl4030.c

+2 −10
Original line number Diff line number Diff line
@@ -211,13 +211,11 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) 
/* Digital audio interface glue - connects codec <--> CPU */

SND_SOC_DAILINK_DEFS(hifi,

	DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.2")),

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.2")));

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-hifi")));



SND_SOC_DAILINK_DEFS(voice,

	DAILINK_COMP_ARRAY(COMP_CPU("omap-mcbsp.3")),

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-voice")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("omap-mcbsp.3")));

	DAILINK_COMP_ARRAY(COMP_CODEC("twl4030-codec", "twl4030-voice")));



static struct snd_soc_dai_link omap_twl4030_dai_links[] = {

	{
@@ -279,18 +277,12 @@ static int omap_twl4030_probe(struct platform_device *pdev) 
		omap_twl4030_dai_links[0].cpus->dai_name  = NULL;

		omap_twl4030_dai_links[0].cpus->of_node = dai_node;



		omap_twl4030_dai_links[0].platforms->name  = NULL;

		omap_twl4030_dai_links[0].platforms->of_node = dai_node;



		dai_node = of_parse_phandle(node, "ti,mcbsp-voice", 0);

		if (!dai_node) {

			card->num_links = 1;

		} else {

			omap_twl4030_dai_links[1].cpus->dai_name  = NULL;

			omap_twl4030_dai_links[1].cpus->of_node = dai_node;



			omap_twl4030_dai_links[1].platforms->name  = NULL;

			omap_twl4030_dai_links[1].platforms->of_node = dai_node;

		}



		priv->jack_detect = of_get_named_gpio(node,

CRA Git | Maintained and supported by SUSTech CRA and CCSE