diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 13:14:28 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-06 21:40:58 +0100 |
commit | 40989980bf4b9483ad2fb99c58324123a8c74c92 (patch) | |
tree | c155fdc4044b63323a8521b55f6976d2856449a8 /sound/soc/cirrus | |
parent | cda80e05c648ff5b702ddbbbf1cd170cc00dba02 (diff) | |
download | lwn-40989980bf4b9483ad2fb99c58324123a8c74c92.tar.gz lwn-40989980bf4b9483ad2fb99c58324123a8c74c92.zip |
ASoC: cirrus: snappercl15: 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>
Diffstat (limited to 'sound/soc/cirrus')
-rw-r--r-- | sound/soc/cirrus/snappercl15.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index dea4909154c8..0b4efcc51232 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -65,16 +65,19 @@ static const struct snd_soc_dapm_route audio_map[] = { {"MICIN", NULL, "Mic Jack"}, }; +SND_SOC_DAILINK_DEFS(aic23, + DAILINK_COMP_ARRAY(COMP_CPU("ep93xx-i2s")), + DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic23-codec.0-001a", + "tlv320aic23-hifi")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("ep93xx-i2s"))); + static struct snd_soc_dai_link snappercl15_dai = { .name = "tlv320aic23", .stream_name = "AIC23", - .cpu_dai_name = "ep93xx-i2s", - .codec_dai_name = "tlv320aic23-hifi", - .codec_name = "tlv320aic23-codec.0-001a", - .platform_name = "ep93xx-i2s", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ops = &snappercl15_ops, + SND_SOC_DAILINK_REG(aic23), }; static struct snd_soc_card snd_soc_snappercl15 = { |