aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-10-04 07:23:26 -0400
committerTakashi Iwai <tiwai@suse.de>2010-10-05 12:11:20 -0400
commitd737f3eedef0717c8b8233bb6455ff13637ff243 (patch)
tree4913b48f10d2f880f5da73bfa2845fa4d08cc575
parent2b830bae1fc2a27b3b0ab86091013bdec3c12427 (diff)
ALSA: virtuoso: fix Xonar STX anti-pop delay
The anti-pop delay for the STX should be 800 ms, not 100 ms like the ST. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/oxygen/xonar_pcm179x.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 571d0ae42afb..d491fd6c0be2 100644
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -374,7 +374,6 @@ static void xonar_st_init_common(struct oxygen *chip)
374{ 374{
375 struct xonar_pcm179x *data = chip->model_data; 375 struct xonar_pcm179x *data = chip->model_data;
376 376
377 data->generic.anti_pop_delay = 100;
378 data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE; 377 data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE;
379 data->dacs = chip->model.private_data ? 4 : 1; 378 data->dacs = chip->model.private_data ? 4 : 1;
380 data->hp_gain_offset = 2*-18; 379 data->hp_gain_offset = 2*-18;
@@ -420,6 +419,7 @@ static void xonar_st_init(struct oxygen *chip)
420{ 419{
421 struct xonar_pcm179x *data = chip->model_data; 420 struct xonar_pcm179x *data = chip->model_data;
422 421
422 data->generic.anti_pop_delay = 100;
423 data->has_cs2000 = 1; 423 data->has_cs2000 = 1;
424 data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1; 424 data->cs2000_fun_cfg_1 = CS2000_REF_CLK_DIV_1;
425 425
@@ -440,6 +440,7 @@ static void xonar_stx_init(struct oxygen *chip)
440 struct xonar_pcm179x *data = chip->model_data; 440 struct xonar_pcm179x *data = chip->model_data;
441 441
442 xonar_st_init_i2c(chip); 442 xonar_st_init_i2c(chip);
443 data->generic.anti_pop_delay = 800;
443 data->generic.ext_power_reg = OXYGEN_GPI_DATA; 444 data->generic.ext_power_reg = OXYGEN_GPI_DATA;
444 data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; 445 data->generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK;
445 data->generic.ext_power_bit = GPI_EXT_POWER; 446 data->generic.ext_power_bit = GPI_EXT_POWER;