diff options
author | 2019-07-06 12:25:26 +0100 | |
---|---|---|
committer | 2019-07-06 12:25:26 +0100 | |
commit | 043b35f281f5f141e7a928d27492133ef33b8119 (patch) | |
tree | 30a9598866d6b8d44ee6b3fe88506881f23e0203 /sound/soc/nuc900/nuc900-audio.c | |
parent | Merge branch 'asoc-5.2' into asoc-linus (diff) | |
parent | ASoC: SOF: Intel: implement runtime idle for CNL/APL (diff) | |
download | linux-dev-043b35f281f5f141e7a928d27492133ef33b8119.tar.xz linux-dev-043b35f281f5f141e7a928d27492133ef33b8119.zip |
Merge branch 'asoc-5.3' into asoc-next
Diffstat (limited to 'sound/soc/nuc900/nuc900-audio.c')
-rw-r--r-- | sound/soc/nuc900/nuc900-audio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/nuc900/nuc900-audio.c b/sound/soc/nuc900/nuc900-audio.c index 58f1dd4760ee..19146690d514 100644 --- a/sound/soc/nuc900/nuc900-audio.c +++ b/sound/soc/nuc900/nuc900-audio.c @@ -17,13 +17,15 @@ #include "nuc900-audio.h" +SND_SOC_DAILINK_DEFS(ac97, + DAILINK_COMP_ARRAY(COMP_CPU("nuc900-ac97")), + DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec", "ac97-hifi")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("nuc900-pcm-audio"))); + static struct snd_soc_dai_link nuc900evb_ac97_dai = { .name = "AC97", .stream_name = "AC97 HiFi", - .cpu_dai_name = "nuc900-ac97", - .codec_dai_name = "ac97-hifi", - .codec_name = "ac97-codec", - .platform_name = "nuc900-pcm-audio", + SND_SOC_DAILINK_REG(ac97), }; static struct snd_soc_card nuc900evb_audio_machine = { |