diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-17 23:53:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-18 11:16:15 +0100 |
| commit | 680fa1f807bc65ea147c6c3ea52751cab75bcd34 (patch) | |
| tree | e69e5282daa9bcfc9341f546bb70fe6a16871d19 /sound/soc/codecs | |
| parent | 6473a148058f8d65fc013a57090354dc737f6143 (diff) | |
| download | op-kernel-dev-680fa1f807bc65ea147c6c3ea52751cab75bcd34.zip op-kernel-dev-680fa1f807bc65ea147c6c3ea52751cab75bcd34.tar.gz | |
ASoC: Convert WM9081 to table based control init
At least for the core controls, the optionally selected controls are still
added programatically.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm9081.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index b2d3448..2b6a75c 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1248,8 +1248,6 @@ static int wm9081_probe(struct snd_soc_codec *codec) snd_soc_write(codec, WM9081_ANALOGUE_SPEAKER_PGA, reg | WM9081_SPKPGAZC); - snd_soc_add_controls(codec, wm9081_snd_controls, - ARRAY_SIZE(wm9081_snd_controls)); if (!wm9081->pdata.num_retune_configs) { dev_dbg(codec->dev, "No ReTune Mobile data, using normal EQ\n"); @@ -1309,6 +1307,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { .reg_cache_default = wm9081_reg_defaults, .volatile_register = wm9081_volatile_register, + .controls = wm9081_snd_controls, + .num_controls = ARRAY_SIZE(wm9081_snd_controls), .dapm_widgets = wm9081_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets), .dapm_routes = wm9081_audio_paths, |
