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

ASoC: kirkwood: armada-370-db: use modern dai_link style 



ASoC is now supporting modern style dai_link
(= snd_soc_dai_link_component) for CPU/Codec/Platform.
This patch switches to use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8ba9c5cb

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

+27 −15
Original line number Diff line number Diff line
@@ -58,28 +58,40 @@ static const struct snd_soc_dapm_route a370db_route[] = { 
	{ "AIN1L",	NULL,	"In Jack" },

};



SND_SOC_DAILINK_DEFS(analog,

	DAILINK_COMP_ARRAY(COMP_CPU("i2s")),

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

	DAILINK_COMP_ARRAY(COMP_EMPTY()));



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()));



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()));



static struct snd_soc_dai_link a370db_dai[] = {

{

	.name = "CS42L51",

	.stream_name = "analog",

	.cpu_dai_name = "i2s",

	.codec_dai_name = "cs42l51-hifi",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

	.ops = &a370db_ops,

	SND_SOC_DAILINK_REG(analog),

},

{

	.name = "S/PDIF out",

	.stream_name = "spdif-out",

	.cpu_dai_name = "spdif",

	.codec_dai_name = "dit-hifi",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

	SND_SOC_DAILINK_REG(spdif_out),

},

{

	.name = "S/PDIF in",

	.stream_name = "spdif-in",

	.cpu_dai_name = "spdif",

	.codec_dai_name = "dir-hifi",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,

	SND_SOC_DAILINK_REG(spdif_in),

},

};
@@ -100,26 +112,26 @@ static int a370db_probe(struct platform_device *pdev) 


	card->dev = &pdev->dev;



	a370db_dai[0].cpu_of_node =

	a370db_dai[0].cpus->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-controller", 0);

	a370db_dai[0].platform_of_node = a370db_dai[0].cpu_of_node;

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



	a370db_dai[0].codec_of_node =

	a370db_dai[0].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-codec", 0);



	a370db_dai[1].cpu_of_node = a370db_dai[0].cpu_of_node;

	a370db_dai[1].platform_of_node = a370db_dai[0].cpu_of_node;

	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].codec_of_node =

	a370db_dai[1].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-codec", 1);



	a370db_dai[2].cpu_of_node = a370db_dai[0].cpu_of_node;

	a370db_dai[2].platform_of_node = a370db_dai[0].cpu_of_node;

	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].codec_of_node =

	a370db_dai[2].codecs->of_node =

		of_parse_phandle(pdev->dev.of_node,

				 "marvell,audio-codec", 2);

CRA Git | Maintained and supported by SUSTech CRA and CCSE