summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm_adsp.h
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>2015-06-18 14:43:19 +0200
committerMark Brown <broonie@kernel.org>2015-06-19 12:17:23 +0200
commit336d0442b9f03a0389baaf09e39880fdd1873cc3 (patch)
tree5328ce06b48de9eb5a35b3f49034818b6b93fba8 /sound/soc/codecs/wm_adsp.h
parentMerge branches 'topic/adsp' and 'topic/dapm' of git://git.kernel.org/pub/scm/... (diff)
downloadlinux-336d0442b9f03a0389baaf09e39880fdd1873cc3.tar.xz
linux-336d0442b9f03a0389baaf09e39880fdd1873cc3.zip
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/wm_adsp.h')
-rw-r--r--sound/soc/codecs/wm_adsp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index 5042cbd39e54..579a6350fb01 100644
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -83,7 +83,7 @@ struct wm_adsp {
#define WM_ADSP2(wname, num) \
WM_ADSP2_E(wname, num, wm_adsp2_early_event)
-extern const struct snd_kcontrol_new wm_adsp1_fw_controls[];
+extern const struct snd_kcontrol_new wm_adsp_fw_controls[];
int wm_adsp1_init(struct wm_adsp *dsp);
int wm_adsp2_init(struct wm_adsp *dsp);