diff options
author | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-07-06 12:25:26 +0100 |
commit | 043b35f281f5f141e7a928d27492133ef33b8119 (patch) | |
tree | 30a9598866d6b8d44ee6b3fe88506881f23e0203 /sound/soc/pxa/z2.c | |
parent | 0dceaf7c798de953c74073cc77be40b7be49abbc (diff) | |
parent | 87a6fe80d56be85bda093c4dd8a3e6535bda7e4a (diff) | |
download | linux-043b35f281f5f141e7a928d27492133ef33b8119.tar.bz2 |
Merge branch 'asoc-5.3' into asoc-next
Diffstat (limited to 'sound/soc/pxa/z2.c')
-rw-r--r-- | sound/soc/pxa/z2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 540a2d0e8daf..f9a33cb36f5b 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -154,17 +154,19 @@ static const struct snd_soc_ops z2_ops = { }; /* z2 digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEFS(wm8750, + DAILINK_COMP_ARRAY(COMP_CPU("pxa2xx-i2s")), + DAILINK_COMP_ARRAY(COMP_CODEC("wm8750.0-001b", "wm8750-hifi")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("pxa-pcm-audio"))); + static struct snd_soc_dai_link z2_dai = { .name = "wm8750", .stream_name = "WM8750", - .cpu_dai_name = "pxa2xx-i2s", - .codec_dai_name = "wm8750-hifi", - .platform_name = "pxa-pcm-audio", - .codec_name = "wm8750.0-001b", .init = z2_wm8750_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .ops = &z2_ops, + SND_SOC_DAILINK_REG(wm8750), }; /* z2 audio machine driver */ |