diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 12:19:45 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 12:19:45 +0200 |
commit | 6791142f41dc3a92a589f66c0af2db7e5fd572a1 (patch) | |
tree | d2f8249a7b6b935f0e344314bb6a7f94612e5727 /sound/soc/codecs/wm5102.c | |
parent | Merge tag 'asoc-v4.2-2' into asoc-next (diff) | |
parent | ASoC: wm_adsp: Move DSP Rate controls into the codec (diff) | |
download | linux-6791142f41dc3a92a589f66c0af2db7e5fd572a1.tar.xz linux-6791142f41dc3a92a589f66c0af2db7e5fd572a1.zip |
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
-rw-r--r-- | sound/soc/codecs/wm5102.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index c5ec519d34be..d097f09e50f2 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1880,6 +1880,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) if (ret) return ret; + ret = snd_soc_add_codec_controls(codec, + arizona_adsp2_rate_controls, 1); + if (ret) + return ret; + arizona_init_spk(codec); arizona_init_gpio(codec); |