Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230123
b: refs/heads/master
c: 79815e0
h: refs/heads/master
i:
  230121: b523fe7
  230119: 9f97c68
v: v3
  • Loading branch information
Clemens Ladisch authored and Takashi Iwai committed Jan 10, 2011
1 parent 5bb4836 commit a5dfe3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4106055cedea86596391f36deacd05616333fbb3
refs/heads/master: 79815e004c75dcc2be6433737b5678cee80035db
5 changes: 5 additions & 0 deletions trunk/sound/pci/oxygen/xonar_pcm179x.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ static void pcm1796_registers_init(struct oxygen *chip)
unsigned int i;
s8 gain_offset;

msleep(1);
gain_offset = data->hp_active ? data->hp_gain_offset : 0;
for (i = 0; i < data->dacs; ++i) {
/* set ATLD before ATL/ATR */
Expand Down Expand Up @@ -451,6 +452,7 @@ static void cs2000_registers_init(struct oxygen *chip)
data->cs2000_regs[CS2000_FUN_CFG_1]);
cs2000_write(chip, CS2000_FUN_CFG_2, 0);
cs2000_write(chip, CS2000_GLOBAL_CFG, CS2000_EN_DEV_CFG_2);
msleep(3); /* PLL lock delay */
}

static void xonar_st_init(struct oxygen *chip)
Expand Down Expand Up @@ -592,6 +594,7 @@ static void set_pcm1796_params(struct oxygen *chip,
{
struct xonar_pcm179x *data = chip->model_data;

msleep(1);
data->current_rate = params_rate(params);
update_pcm1796_oversampling(chip);
}
Expand Down Expand Up @@ -669,6 +672,7 @@ static void update_cs2000_rate(struct oxygen *chip, unsigned int rate)
else
reg = CS2000_REF_CLK_DIV_2;
cs2000_write_cached(chip, CS2000_FUN_CFG_1, reg);
msleep(3); /* PLL lock delay */
}

static void set_st_params(struct oxygen *chip,
Expand Down Expand Up @@ -796,6 +800,7 @@ static int os_128_put(struct snd_kcontrol *ctl,
oxygen_write16_masked(chip, OXYGEN_I2S_MULTICH_FORMAT,
mclk_from_rate(chip, data->current_rate),
OXYGEN_I2S_MCLK_MASK);
msleep(1);
update_pcm1796_oversampling(chip);
}
mutex_unlock(&chip->mutex);
Expand Down

0 comments on commit a5dfe3c

Please sign in to comment.