diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-18 09:40:41 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-18 09:40:41 +0800 |
| commit | d79261dd80927133199a8ff64307a967153a8cac (patch) | |
| tree | 6c51ec68ae96efd4d42c261e1f96a4225581a4ce /sound | |
| parent | c530df5c0700e669a5eb17d32b20be0a1dc96c75 (diff) | |
| parent | 16daa112579e6878fa8e505d5789fdec239df81a (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 32481c6dc720..2f5ce28d70a0 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -4097,15 +4097,31 @@ static int wm8962_probe(struct snd_soc_codec *codec) pdata->mic_cfg); } - /* set the default volume for headphpone and speaker */ + /* set the default volume for playback and record*/ snd_soc_update_bits(codec, WM8962_HPOUTL_VOLUME, - WM8962_HPOUTL_VOL_MASK, 0x65); + WM8962_HPOUTL_VOL_MASK, 0x5d); snd_soc_update_bits(codec, WM8962_HPOUTR_VOLUME, - WM8962_HPOUTR_VOL_MASK, 0x65); + WM8962_HPOUTR_VOL_MASK, 0x5d); snd_soc_update_bits(codec, WM8962_SPKOUTL_VOLUME, WM8962_SPKOUTL_VOL_MASK, 0x72); snd_soc_update_bits(codec, WM8962_SPKOUTR_VOLUME, WM8962_SPKOUTR_VOL_MASK, 0x72); + snd_soc_update_bits(codec, WM8962_LEFT_DAC_VOLUME, + WM8962_DACL_VOL_MASK, 0xd8); + snd_soc_update_bits(codec, WM8962_RIGHT_DAC_VOLUME, + WM8962_DACR_VOL_MASK, 0xd8); + + snd_soc_update_bits(codec, WM8962_LEFT_INPUT_VOLUME, + WM8962_INL_VOL_MASK, 0x3f); + snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_VOLUME, + WM8962_INR_VOL_MASK, 0x3f); + snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME, + WM8962_ADCL_VOL_MASK, 0xd8); + snd_soc_update_bits(codec, WM8962_LEFT_ADC_VOLUME, + WM8962_ADCR_VOL_MASK, 0xd8); + snd_soc_update_bits(codec, WM8962_RIGHT_INPUT_MIXER_VOLUME, + WM8962_IN3R_MIXINR_VOL_MASK, 0x7); + /* Latch volume update bits */ snd_soc_update_bits(codec, WM8962_LEFT_INPUT_VOLUME, |