ASoC: SSM2602: add SND control for mic boost2 and default it to off
authorCliff Cai <cliff.cai@analog.com>
Tue, 9 Mar 2010 17:58:09 +0000 (12:58 -0500)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Mar 2010 11:59:56 +0000 (11:59 +0000)
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>
sound/soc/codecs/ssm2602.c

index d2ff1cde6883c31412559540c7f3a37dcc2d06f8..942f5dc30801ee6ec2606e0bca43910a12f799e1 100644 (file)
@@ -139,6 +139,7 @@ SOC_DOUBLE_R("Capture Volume", SSM2602_LINVOL, SSM2602_RINVOL, 0, 31, 0),
 SOC_DOUBLE_R("Capture Switch", SSM2602_LINVOL, SSM2602_RINVOL, 7, 1, 1),
 
 SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0),
+SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 7, 1, 0),
 SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1),
 
 SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1),
@@ -604,8 +605,7 @@ static int ssm2602_init(struct snd_soc_device *socdev)
        reg = ssm2602_read_reg_cache(codec, SSM2602_ROUT1V);
        ssm2602_write(codec, SSM2602_ROUT1V, reg | ROUT1V_RLHP_BOTH);
        /*select Line in as default input*/
-       ssm2602_write(codec, SSM2602_APANA,
-                       APANA_ENABLE_MIC_BOOST2 | APANA_SELECT_DAC |
+       ssm2602_write(codec, SSM2602_APANA, APANA_SELECT_DAC |
                        APANA_ENABLE_MIC_BOOST);
        ssm2602_write(codec, SSM2602_PWR, 0);