aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-11 17:59:35 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-18 01:07:49 -0500
commite5ddd303215d1e5e89d06056d17673b18219ace3 (patch)
tree79a0abe46085fdceaf3d7b78c5b8e2e248b035d5 /sound
parent4706ccbbe89c0c1871134f493de8b27864b869ba (diff)
ASoC: wm5102: Add controls for firmware selection
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm5102.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 2adcfbae4d22..5e85b645f2eb 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1579,6 +1579,10 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
1579 if (ret != 0) 1579 if (ret != 0)
1580 return ret; 1580 return ret;
1581 1581
1582 ret = snd_soc_add_codec_controls(codec, wm_adsp_fw_controls, 1);
1583 if (ret != 0)
1584 return ret;
1585
1582 snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); 1586 snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
1583 1587
1584 priv->core.arizona->dapm = &codec->dapm; 1588 priv->core.arizona->dapm = &codec->dapm;