diff options
Diffstat (limited to 'sound/soc/codecs/wm8955.c')
| -rw-r--r-- | sound/soc/codecs/wm8955.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 7167dfc96aa7..5e0214d6293e 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c | |||
| @@ -934,16 +934,27 @@ static int wm8955_probe(struct snd_soc_codec *codec) | |||
| 934 | } | 934 | } |
| 935 | 935 | ||
| 936 | /* Change some default settings - latch VU and enable ZC */ | 936 | /* Change some default settings - latch VU and enable ZC */ |
| 937 | reg_cache[WM8955_LEFT_DAC_VOLUME] |= WM8955_LDVU; | 937 | snd_soc_update_bits(codec, WM8955_LEFT_DAC_VOLUME, |
| 938 | reg_cache[WM8955_RIGHT_DAC_VOLUME] |= WM8955_RDVU; | 938 | WM8955_LDVU, WM8955_LDVU); |
| 939 | reg_cache[WM8955_LOUT1_VOLUME] |= WM8955_LO1VU | WM8955_LO1ZC; | 939 | snd_soc_update_bits(codec, WM8955_RIGHT_DAC_VOLUME, |
| 940 | reg_cache[WM8955_ROUT1_VOLUME] |= WM8955_RO1VU | WM8955_RO1ZC; | 940 | WM8955_RDVU, WM8955_RDVU); |
| 941 | reg_cache[WM8955_LOUT2_VOLUME] |= WM8955_LO2VU | WM8955_LO2ZC; | 941 | snd_soc_update_bits(codec, WM8955_LOUT1_VOLUME, |
| 942 | reg_cache[WM8955_ROUT2_VOLUME] |= WM8955_RO2VU | WM8955_RO2ZC; | 942 | WM8955_LO1VU | WM8955_LO1ZC, |
| 943 | reg_cache[WM8955_MONOOUT_VOLUME] |= WM8955_MOZC; | 943 | WM8955_LO1VU | WM8955_LO1ZC); |
| 944 | snd_soc_update_bits(codec, WM8955_ROUT1_VOLUME, | ||
| 945 | WM8955_RO1VU | WM8955_RO1ZC, | ||
| 946 | WM8955_RO1VU | WM8955_RO1ZC); | ||
| 947 | snd_soc_update_bits(codec, WM8955_LOUT2_VOLUME, | ||
| 948 | WM8955_LO2VU | WM8955_LO2ZC, | ||
| 949 | WM8955_LO2VU | WM8955_LO2ZC); | ||
| 950 | snd_soc_update_bits(codec, WM8955_ROUT2_VOLUME, | ||
| 951 | WM8955_RO2VU | WM8955_RO2ZC, | ||
| 952 | WM8955_RO2VU | WM8955_RO2ZC); | ||
| 953 | snd_soc_update_bits(codec, WM8955_MONOOUT_VOLUME, | ||
| 954 | WM8955_MOZC, WM8955_MOZC); | ||
| 944 | 955 | ||
| 945 | /* Also enable adaptive bass boost by default */ | 956 | /* Also enable adaptive bass boost by default */ |
| 946 | reg_cache[WM8955_BASS_CONTROL] |= WM8955_BB; | 957 | snd_soc_update_bits(codec, WM8955_BASS_CONTROL, WM8955_BB, WM8955_BB); |
| 947 | 958 | ||
| 948 | /* Set platform data values */ | 959 | /* Set platform data values */ |
| 949 | if (pdata) { | 960 | if (pdata) { |