Commit 0baddbc8 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'fix/lx6464es' into for-linus

* fix/lx6464es:
  ALSA: lx6464es - configure ethersound io channels
parents cdae219c 7e895cfa
......@@ -654,13 +654,12 @@ static int __devinit lx_init_ethersound_config(struct lx6464es *chip)
int i;
u32 orig_conf_es = lx_dsp_reg_read(chip, eReg_CONFES);
u32 default_conf_es = (64 << IOCR_OUTPUTS_OFFSET) |
/* configure 64 io channels */
u32 conf_es = (orig_conf_es & CONFES_READ_PART_MASK) |
(64 << IOCR_INPUTS_OFFSET) |
(64 << IOCR_OUTPUTS_OFFSET) |
(FREQ_RATIO_SINGLE_MODE << FREQ_RATIO_OFFSET);
u32 conf_es = (orig_conf_es & CONFES_READ_PART_MASK)
| (default_conf_es & CONFES_WRITE_PART_MASK);
snd_printdd("->lx_init_ethersound\n");
chip->freq_ratio = FREQ_RATIO_SINGLE_MODE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment