aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/virtuoso.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-04-16 03:14:30 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:37 -0400
commite983532e446ac7fabe829d9e3aeff8e26b0a277d (patch)
tree455202378ea19eb64e80b5c764b05a23a97d5f96 /sound/pci/oxygen/virtuoso.c
parent193e813814775b1b1574515fc6f11e61b29a54f7 (diff)
[ALSA] oxygen: mute by default
Initialize the playback volume controls as being muted and having minimal volume. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/virtuoso.c')
-rw-r--r--sound/pci/oxygen/virtuoso.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 37f53a8c5888..fe4e289840b4 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -188,12 +188,13 @@ static void xonar_d2_init(struct oxygen *chip)
188 data->output_enable_bit = GPIO_D2_OUTPUT_ENABLE; 188 data->output_enable_bit = GPIO_D2_OUTPUT_ENABLE;
189 189
190 for (i = 0; i < 4; ++i) { 190 for (i = 0; i < 4; ++i) {
191 pcm1796_write(chip, i, 18, PCM1796_FMT_24_LJUST | PCM1796_ATLD); 191 pcm1796_write(chip, i, 18, PCM1796_MUTE | PCM1796_DMF_DISABLED |
192 PCM1796_FMT_24_LJUST | PCM1796_ATLD);
192 pcm1796_write(chip, i, 19, PCM1796_FLT_SHARP | PCM1796_ATS_1); 193 pcm1796_write(chip, i, 19, PCM1796_FLT_SHARP | PCM1796_ATS_1);
193 pcm1796_write(chip, i, 20, PCM1796_OS_64); 194 pcm1796_write(chip, i, 20, PCM1796_OS_64);
194 pcm1796_write(chip, i, 21, 0); 195 pcm1796_write(chip, i, 21, 0);
195 pcm1796_write(chip, i, 16, 0xff); /* set ATL/ATR after ATLD */ 196 pcm1796_write(chip, i, 16, 0x0f); /* set ATL/ATR after ATLD */
196 pcm1796_write(chip, i, 17, 0xff); 197 pcm1796_write(chip, i, 17, 0x0f);
197 } 198 }
198 199
199 oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2_ALT); 200 oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_D2_ALT);
@@ -239,8 +240,8 @@ static void xonar_dx_init(struct oxygen *chip)
239 CS4398_DEM_NONE | CS4398_DIF_LJUST); 240 CS4398_DEM_NONE | CS4398_DIF_LJUST);
240 cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L); 241 cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L);
241 cs4398_write(chip, 4, CS4398_MUTEP_LOW | CS4398_PAMUTE); 242 cs4398_write(chip, 4, CS4398_MUTEP_LOW | CS4398_PAMUTE);
242 cs4398_write(chip, 5, 0); 243 cs4398_write(chip, 5, 0xfe);
243 cs4398_write(chip, 6, 0); 244 cs4398_write(chip, 6, 0xfe);
244 cs4398_write(chip, 7, CS4398_RMP_DN | CS4398_RMP_UP | 245 cs4398_write(chip, 7, CS4398_RMP_DN | CS4398_RMP_UP |
245 CS4398_ZERO_CROSS | CS4398_SOFT_RAMP); 246 CS4398_ZERO_CROSS | CS4398_SOFT_RAMP);
246 cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST); 247 cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST);
@@ -250,16 +251,16 @@ static void xonar_dx_init(struct oxygen *chip)
250 cs4362a_write(chip, 0x05, 0); 251 cs4362a_write(chip, 0x05, 0);
251 cs4362a_write(chip, 0x06, CS4362A_FM_SINGLE | 252 cs4362a_write(chip, 0x06, CS4362A_FM_SINGLE |
252 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L); 253 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L);
254 cs4362a_write(chip, 0x07, 0x7f | CS4362A_MUTE);
255 cs4362a_write(chip, 0x08, 0x7f | CS4362A_MUTE);
253 cs4362a_write(chip, 0x09, CS4362A_FM_SINGLE | 256 cs4362a_write(chip, 0x09, CS4362A_FM_SINGLE |
254 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L); 257 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L);
258 cs4362a_write(chip, 0x0a, 0x7f | CS4362A_MUTE);
259 cs4362a_write(chip, 0x0b, 0x7f | CS4362A_MUTE);
255 cs4362a_write(chip, 0x0c, CS4362A_FM_SINGLE | 260 cs4362a_write(chip, 0x0c, CS4362A_FM_SINGLE |
256 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L); 261 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L);
257 cs4362a_write(chip, 0x07, 0); 262 cs4362a_write(chip, 0x0d, 0x7f | CS4362A_MUTE);
258 cs4362a_write(chip, 0x08, 0); 263 cs4362a_write(chip, 0x0e, 0x7f | CS4362A_MUTE);
259 cs4362a_write(chip, 0x0a, 0);
260 cs4362a_write(chip, 0x0b, 0);
261 cs4362a_write(chip, 0x0d, 0);
262 cs4362a_write(chip, 0x0e, 0);
263 /* clear power down */ 264 /* clear power down */
264 cs4398_write(chip, 8, CS4398_CPEN); 265 cs4398_write(chip, 8, CS4398_CPEN);
265 cs4362a_write(chip, 0x01, CS4362A_CPEN); 266 cs4362a_write(chip, 0x01, CS4362A_CPEN);