[PATCH] [UBUNTU:sound/pci/ice1712/] Don't use Consumer AC97 for Terratec DMX6fire

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/pci/ice1712/] Don't use Consumer AC97 for Terratec DMX6fire

UpstreamStatus: Added in upstream alsa-kernel hg changeset 874960219fe3
                http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=874960219fe364abb68336d0b56a559bcd58bbf0;style=raw

Takashi Iwai committed this fix for the Terratec DMX6fire that disables
the consumer AC97, because its eeprom mistakenly indicates it should be
used.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
Signed-off-by: Alan Horstmann <gineera at aspect135.co.uk>

---

 sound/pci/ice1712/ice1712.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

76af446ada349cef19bd772eda83f4a4ff744947
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 51c16df..e032239 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2419,13 +2419,14 @@ static int __devinit snd_ice1712_chip_in
 	udelay(200);
 	outb(ICE1712_NATIVE, ICEREG(ice, CONTROL));
 	udelay(200);
-	if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE && !ice->dxr_enable) {
-                /* Limit active ADCs and DACs to 6;  */
-                /* Note: DXR extension not supported */
-		pci_write_config_byte(ice->pci, 0x60, 0x2a);
-	} else {
-		pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]);
-	}
+	if (ice->eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE &&
+	    !ice->dxr_enable)
+		/*  Set eeprom value to limit active ADCs and DACs to 6;
+		 *  Also disable AC97 as no hardware in standard 6fire card/box
+		 *  Note: DXR extensions are not currently supported
+		 */
+		ice->eeprom.data[ICE_EEP1_CODEC] = 0x3a;
+	pci_write_config_byte(ice->pci, 0x60, ice->eeprom.data[ICE_EEP1_CODEC]);
 	pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
 	pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
 	pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060602/a2cbf7ee/attachment.sig>