diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 14:10:15 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 15:30:29 -0500 |
commit | 7c2de633863fcd46537d9ddbf5a9701f48225268 (patch) | |
tree | 46cfdfd6de2241fb39300d359233ef5efe422739 /sound | |
parent | 0627bd2575a30a83901b79d7bcf2ca1fa09fbb8b (diff) |
ASoC: Ensure WM8958 gets all WM8994 late revision widgets
Without this fix the driver won't instantiate properly on relevant
devices.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index d92673314f43..c6c958ee5d59 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
@@ -3325,6 +3325,12 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3325 | case WM8958: | 3325 | case WM8958: |
3326 | snd_soc_add_controls(codec, wm8958_snd_controls, | 3326 | snd_soc_add_controls(codec, wm8958_snd_controls, |
3327 | ARRAY_SIZE(wm8958_snd_controls)); | 3327 | ARRAY_SIZE(wm8958_snd_controls)); |
3328 | snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets, | ||
3329 | ARRAY_SIZE(wm8994_lateclk_widgets)); | ||
3330 | snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets, | ||
3331 | ARRAY_SIZE(wm8994_adc_widgets)); | ||
3332 | snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets, | ||
3333 | ARRAY_SIZE(wm8994_dac_widgets)); | ||
3328 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, | 3334 | snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, |
3329 | ARRAY_SIZE(wm8958_dapm_widgets)); | 3335 | ARRAY_SIZE(wm8958_dapm_widgets)); |
3330 | break; | 3336 | break; |
@@ -3350,6 +3356,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3350 | } | 3356 | } |
3351 | break; | 3357 | break; |
3352 | case WM8958: | 3358 | case WM8958: |
3359 | snd_soc_dapm_add_routes(dapm, wm8994_lateclk_intercon, | ||
3360 | ARRAY_SIZE(wm8994_lateclk_intercon)); | ||
3353 | snd_soc_dapm_add_routes(dapm, wm8958_intercon, | 3361 | snd_soc_dapm_add_routes(dapm, wm8958_intercon, |
3354 | ARRAY_SIZE(wm8958_intercon)); | 3362 | ARRAY_SIZE(wm8958_intercon)); |
3355 | break; | 3363 | break; |