Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence

Browse source 
Let "chip reset" become first. Increasement of the "chip reset" related timeout
leads to correctly read eeprom's contents here.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Karsten Wiese 2008-04-22 12:52:15 +02:00 • committed by Takashi Iwai
parent 0d52cea487
commit 988f066477
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sound/pci/ice1712/ice1724.c
View file

@ -2045,12 +2045,16 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice) static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice)
{ {
outb(VT1724_RESET , ICEREG1724(ice, CONTROL)); outb(VT1724_RESET , ICEREG1724(ice, CONTROL));
udelay(200); msleep(10);
outb(0, ICEREG1724(ice, CONTROL)); outb(0, ICEREG1724(ice, CONTROL));
udelay(200); msleep(10);
}
static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice)
{
outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG)); outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG));
outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG)); outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG));
outb(ice->eeprom.data[ICE_EEP2_I2S], ICEREG1724(ice, I2S_FEATURES)); outb(ice->eeprom.data[ICE_EEP2_I2S], ICEREG1724(ice, I2S_FEATURES));
@ -2223,6 +2227,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
ice->irq = pci->irq; ice->irq = pci->irq;
snd_vt1724_chip_reset(ice);
if (snd_vt1724_read_eeprom(ice, modelname) < 0) { if (snd_vt1724_read_eeprom(ice, modelname) < 0) {
snd_vt1724_free(ice); snd_vt1724_free(ice);
return -EIO; return -EIO;