diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-22 13:19:45 +0300 |
| commit | 6791142f41dc3a92a589f66c0af2db7e5fd572a1 (patch) | |
| tree | d2f8249a7b6b935f0e344314bb6a7f94612e5727 /sound/soc/codecs/wm5110.c | |
| parent | 25305dcf5de52fe48437c46dd4d15d1e87b9fbee (diff) | |
| parent | 336d0442b9f03a0389baaf09e39880fdd1873cc3 (diff) | |
| download | linux-6791142f41dc3a92a589f66c0af2db7e5fd572a1.tar.xz | |
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm5110.c')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 5f032a37b61f..709fcc6169d8 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1614,6 +1614,12 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) return ret; } + ret = snd_soc_add_codec_controls(codec, + arizona_adsp2_rate_controls, + WM5110_NUM_ADSP); + if (ret) + return ret; + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); return 0; |