diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-06-06 00:12:29 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-06 16:35:09 -0400 |
commit | 8ba9c5cbe9f27808346927bf173b263e2552f80f (patch) | |
tree | 6757bc424e92951e3c8f90141871a9107d83a232 | |
parent | 196a521a3c86eb627004cf6b420cd7b2f6c587a0 (diff) |
ASoC: pxa: poodle: 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>
-rw-r--r-- | sound/soc/pxa/poodle.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index b6693f32fc02..2a564187b2ce 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -224,16 +224,18 @@ static const struct snd_kcontrol_new wm8731_poodle_controls[] = { | |||
224 | }; | 224 | }; |
225 | 225 | ||
226 | /* poodle digital audio interface glue - connects codec <--> CPU */ | 226 | /* poodle digital audio interface glue - connects codec <--> CPU */ |
227 | SND_SOC_DAILINK_DEFS(wm8731, | ||
228 | DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-i2s")), | ||
229 | DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")), | ||
230 | DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio"))); | ||
231 | |||
227 | static struct snd_soc_dai_link poodle_dai = { | 232 | static struct snd_soc_dai_link poodle_dai = { |
228 | .name = "WM8731", | 233 | .name = "WM8731", |
229 | .stream_name = "WM8731", | 234 | .stream_name = "WM8731", |
230 | .cpu_dai_name = "pxa2xx-i2s", | ||
231 | .codec_dai_name = "wm8731-hifi", | ||
232 | .platform_name = "pxa-pcm-audio", | ||
233 | .codec_name = "wm8731.0-001b", | ||
234 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | 235 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | |
235 | SND_SOC_DAIFMT_CBS_CFS, | 236 | SND_SOC_DAIFMT_CBS_CFS, |
236 | .ops = &poodle_ops, | 237 | .ops = &poodle_ops, |
238 | SND_SOC_DAILINK_REG(wm8731), | ||
237 | }; | 239 | }; |
238 | 240 | ||
239 | /* poodle audio machine driver */ | 241 | /* poodle audio machine driver */ |