diff options
| author | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> | 2015-06-18 13:43:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-19 11:17:23 +0100 |
| commit | 336d0442b9f03a0389baaf09e39880fdd1873cc3 (patch) | |
| tree | 5328ce06b48de9eb5a35b3f49034818b6b93fba8 /sound/soc/codecs/wm5110.c | |
| parent | 89a6192049050035cbd779d35686cbf29ca9184f (diff) | |
ASoC: wm_adsp: Move DSP Rate controls into the codec
The rate controls are codec-specific, it's not possible to
generically say what the range or the meaning of each control
is (or even if they exist at all) - that depends on the
particular codec.
This is currently being handled for Arizona codecs by putting
an Arizona-specific table of controls inside the wm_adsp driver.
This creates a dependency between wm_adsp and arizona.c, and is an
awkward solution if the ADSP is used in another family of codecs
Fix this by moving the Arizona-specific rate controls into the
Arizona codec drivers.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
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 226596723418..944354ddc0c4 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; |