android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: samsung: odroid: use modern dai_link style

Browse Source 
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:10:26 +09:00 committed by Mark Brown
parent 400127a12a
commit 3cddda10c2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/samsung/odroid.c
View File

@ -151,39 +151,48 @@ static const struct snd_soc_dapm_route odroid_dapm_routes[] = {
{ "HiFi Playback", NULL, "Mixer DAI TX" }, { "HiFi Playback", NULL, "Mixer DAI TX" },
}; };
SND_SOC_DAILINK_DEFS(primary,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("3830000.i2s")));
SND_SOC_DAILINK_DEFS(mixer,
DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_DUMMY()));
SND_SOC_DAILINK_DEFS(secondary,
DAILINK_COMP_ARRAY(COMP_EMPTY()),
DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_PLATFORM("3830000.i2s-sec")));
static struct snd_soc_dai_link odroid_card_dais[] = { static struct snd_soc_dai_link odroid_card_dais[] = {
{ {
/* Primary FE <-> BE link */ /* Primary FE <-> BE link */
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.ops = &odroid_card_fe_ops, .ops = &odroid_card_fe_ops,
.name = "Primary", .name = "Primary",
.stream_name = "Primary", .stream_name = "Primary",
.platform_name = "3830000.i2s",
.dynamic = 1, .dynamic = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
SND_SOC_DAILINK_REG(primary),
}, { }, {
/* BE <-> CODECs link */ /* BE <-> CODECs link */
.name = "I2S Mixer", .name = "I2S Mixer",
.cpu_name = "snd-soc-dummy",
.cpu_dai_name = "snd-soc-dummy-dai",
.platform_name = "snd-soc-dummy",
.ops = &odroid_card_be_ops, .ops = &odroid_card_be_ops,
.no_pcm = 1, .no_pcm = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBS_CFS,
SND_SOC_DAILINK_REG(mixer),
}, { }, {
/* Secondary FE <-> BE link */ /* Secondary FE <-> BE link */
.playback_only = 1, .playback_only = 1,
.codec_name = "snd-soc-dummy",
.codec_dai_name = "snd-soc-dummy-dai",
.ops = &odroid_card_fe_ops, .ops = &odroid_card_fe_ops,
.name = "Secondary", .name = "Secondary",
.stream_name = "Secondary", .stream_name = "Secondary",
.platform_name = "3830000.i2s-sec",
.dynamic = 1, .dynamic = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
SND_SOC_DAILINK_REG(secondary),
} }
}; };
@ -262,7 +271,7 @@ static int odroid_audio_probe(struct platform_device *pdev)
break; break;
} }
ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name); ret = snd_soc_get_dai_name(&args, &link->cpus->dai_name);
of_node_put(args.np); of_node_put(args.np);
if (ret < 0) if (ret < 0)