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

ASoC: kirkwood: armada-370-db: 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 d8893261

sound/soc/kirkwood/armada-370-db.c

+3 −9
Original line number Diff line number Diff line
@@ -60,18 +60,15 @@ static const struct snd_soc_dapm_route a370db_route[] = { 


SND_SOC_DAILINK_DEFS(analog,

	DAILINK_COMP_ARRAY(COMP_CPU("i2s")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")));



SND_SOC_DAILINK_DEFS(spdif_out,

	DAILINK_COMP_ARRAY(COMP_CPU("spdif")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")));



SND_SOC_DAILINK_DEFS(spdif_in,

	DAILINK_COMP_ARRAY(COMP_CPU("spdif")),

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")),

	DAILINK_COMP_ARRAY(COMP_EMPTY()));

	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")));



static struct snd_soc_dai_link a370db_dai[] = {

{
@@ -115,21 +112,18 @@ static int a370db_probe(struct platform_device *pdev) 
	a370db_dai[0].cpus->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-controller", 0);

	a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;



	a370db_dai[0].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-codec", 0);



	a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;

	a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node;



	a370db_dai[1].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-codec", 1);



	a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;

	a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node;



	a370db_dai[2].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

CRA Git | Maintained and supported by SUSTech CRA and CCSE