Commit 2e21f2ac authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds

[PATCH] ALI IDE forward port from 2.4.x

This forward-ports some more of the ALI IDE sanity checks from the 2.4.x
tree. 

In particular, we only do the enable bits for revisions < 0xC5
parent b4a80dac
...@@ -629,11 +629,13 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char ...@@ -629,11 +629,13 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char
* box without a device at 0:0.0. The ALi bridge will be at * box without a device at 0:0.0. The ALi bridge will be at
* 0:0.0 so if we didn't find one we know what is cooking. * 0:0.0 so if we didn't find one we know what is cooking.
*/ */
if (!isa_dev || (north && north->vendor != PCI_VENDOR_ID_AL)) { if (north && north->vendor != PCI_VENDOR_ID_AL) {
local_irq_restore(flags); local_irq_restore(flags);
return 0; return 0;
} }
if (m5229_revision < 0xC5 && isa_dev)
{
/* /*
* set south-bridge's enable bit, m1533, 0x79 * set south-bridge's enable bit, m1533, 0x79
*/ */
...@@ -650,7 +652,7 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char ...@@ -650,7 +652,7 @@ static unsigned int __init init_chipset_ali15x3 (struct pci_dev *dev, const char
*/ */
pci_write_config_byte(isa_dev, 0x79, tmpbyte | 0x02); pci_write_config_byte(isa_dev, 0x79, tmpbyte | 0x02);
} }
}
local_irq_restore(flags); local_irq_restore(flags);
return 0; return 0;
} }
......
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