diff options
author | Cliff Cai <cliff.cai@analog.com> | 2010-03-09 12:58:09 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-10 06:59:56 -0500 |
commit | 4b527e2900531befd3d4df2e70c85029ea571f1a (patch) | |
tree | d9885f09d2fde1f0ada474a1c07c845d7a5049d7 | |
parent | 8d43d1bc81190ee8e4e694d805afa586339b0afc (diff) |
ASoC: SSM2602: add SND control for mic boost2 and default it to off
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index d2ff1cde6883..942f5dc30801 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c | |||
@@ -139,6 +139,7 @@ SOC_DOUBLE_R("Capture Volume", SSM2602_LINVOL, SSM2602_RINVOL, 0, 31, 0), | |||
139 | SOC_DOUBLE_R("Capture Switch", SSM2602_LINVOL, SSM2602_RINVOL, 7, 1, 1), | 139 | SOC_DOUBLE_R("Capture Switch", SSM2602_LINVOL, SSM2602_RINVOL, 7, 1, 1), |
140 | 140 | ||
141 | SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0), | 141 | SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0), |
142 | SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 7, 1, 0), | ||
142 | SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1), | 143 | SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1), |
143 | 144 | ||
144 | SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1), | 145 | SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1), |
@@ -604,8 +605,7 @@ static int ssm2602_init(struct snd_soc_device *socdev) | |||
604 | reg = ssm2602_read_reg_cache(codec, SSM2602_ROUT1V); | 605 | reg = ssm2602_read_reg_cache(codec, SSM2602_ROUT1V); |
605 | ssm2602_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH); | 606 | ssm2602_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH); |
606 | /*select Line in as default input*/ | 607 | /*select Line in as default input*/ |
607 | ssm2602_write(codec, SSM2602_APANA, | 608 | ssm2602_write(codec, SSM2602_APANA, APANA_SELECT_DAC | |
608 | APANA_ENABLE_MIC_BOOST2 | APANA_SELECT_DAC | | ||
609 | APANA_ENABLE_MIC_BOOST); | 609 | APANA_ENABLE_MIC_BOOST); |
610 | ssm2602_write(codec, SSM2602_PWR, 0); | 610 | ssm2602_write(codec, SSM2602_PWR, 0); |
611 | 611 | ||