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

ASoC: atmel: sam9g20_wm8731: 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 318ebbe8

sound/soc/atmel/sam9g20_wm8731.c

+1 −4
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) 


SND_SOC_DAILINK_DEFS(pcm,

	DAILINK_COMP_ARRAY(COMP_CPU("at91rm9200_ssc.0")),

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")),

	DAILINK_COMP_ARRAY(COMP_PLATFORM("at91rm9200_ssc.0")));

	DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")));



static struct snd_soc_dai_link at91sam9g20ek_dai = {

	.name = "WM8731",
@@ -223,14 +222,12 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 


	/* Parse dai and platform info */

	at91sam9g20ek_dai.cpus->dai_name = NULL;

	at91sam9g20ek_dai.platforms->name = NULL;

	cpu_np = of_parse_phandle(np, "atmel,ssc-controller", 0);

	if (!cpu_np) {

		dev_err(&pdev->dev, "dai and pcm info missing\n");

		return -EINVAL;

	}

	at91sam9g20ek_dai.cpus->of_node = cpu_np;

	at91sam9g20ek_dai.platforms->of_node = cpu_np;



	of_node_put(codec_np);

	of_node_put(cpu_np);

CRA Git | Maintained and supported by SUSTech CRA and CCSE