UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-06-06 13:12:34 +09:00 committed by Mark Brown
parent 8ba9c5cbe9
commit 1d17821f79
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sound/soc/kirkwood/armada-370-db.c
View File

@ -58,28 +58,40 @@ static const struct snd_soc_dapm_route a370db_route[] = {
{ "AIN1L", NULL, "In Jack" }, { "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[] = { static struct snd_soc_dai_link a370db_dai[] = {
{ {
.name = "CS42L51", .name = "CS42L51",
.stream_name = "analog", .stream_name = "analog",
.cpu_dai_name = "i2s",
.codec_dai_name = "cs42l51-hifi",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
.ops = &a370db_ops, .ops = &a370db_ops,
SND_SOC_DAILINK_REG(analog),
}, },
{ {
.name = "S/PDIF out", .name = "S/PDIF out",
.stream_name = "spdif-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, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
SND_SOC_DAILINK_REG(spdif_out),
}, },
{ {
.name = "S/PDIF in", .name = "S/PDIF in",
.stream_name = "spdif-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, .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; card->dev = &pdev->dev;
a370db_dai[0].cpu_of_node = a370db_dai[0].cpus->of_node =
of_parse_phandle(pdev->dev.of_node, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-controller", 0); "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, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 0); "marvell,audio-codec", 0);
a370db_dai[1].cpu_of_node = a370db_dai[0].cpu_of_node; a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[1].platform_of_node = a370db_dai[0].cpu_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, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 1); "marvell,audio-codec", 1);
a370db_dai[2].cpu_of_node = a370db_dai[0].cpu_of_node; a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;
a370db_dai[2].platform_of_node = a370db_dai[0].cpu_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, of_parse_phandle(pdev->dev.of_node,
"marvell,audio-codec", 2); "marvell,audio-codec", 2);