diff options
author | Karsten Wiese <fzu@wemgehoertderstaat.de> | 2008-04-22 06:52:15 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:39 -0400 |
commit | 988f0664779674c7c06252a6d549eee8debd5d76 (patch) | |
tree | 5c673a15df83684de22606e267710c24947e96f9 /sound/pci | |
parent | 0d52cea487c0213d6d7bca9c951210081e7b653b (diff) |
[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence
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>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index ceac87056263..6b15e1cbfe4f 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2045,12 +2045,16 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, | |||
2045 | 2045 | ||
2046 | 2046 | ||
2047 | 2047 | ||
2048 | static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice) | 2048 | static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice) |
2049 | { | 2049 | { |
2050 | outb(VT1724_RESET , ICEREG1724(ice, CONTROL)); | 2050 | outb(VT1724_RESET , ICEREG1724(ice, CONTROL)); |
2051 | udelay(200); | 2051 | msleep(10); |
2052 | outb(0, ICEREG1724(ice, CONTROL)); | 2052 | outb(0, ICEREG1724(ice, CONTROL)); |
2053 | udelay(200); | 2053 | msleep(10); |
2054 | } | ||
2055 | |||
2056 | static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice) | ||
2057 | { | ||
2054 | outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG)); | 2058 | outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG)); |
2055 | outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG)); | 2059 | outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG)); |
2056 | outb(ice->eeprom.data[ICE_EEP2_I2S], ICEREG1724(ice, I2S_FEATURES)); | 2060 | 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, | |||
2223 | 2227 | ||
2224 | ice->irq = pci->irq; | 2228 | ice->irq = pci->irq; |
2225 | 2229 | ||
2230 | snd_vt1724_chip_reset(ice); | ||
2226 | if (snd_vt1724_read_eeprom(ice, modelname) < 0) { | 2231 | if (snd_vt1724_read_eeprom(ice, modelname) < 0) { |
2227 | snd_vt1724_free(ice); | 2232 | snd_vt1724_free(ice); |
2228 | return -EIO; | 2233 | return -EIO; |