Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / southbridge / amd / amd8111 / amd8111_ide.c

diff --git a/src/southbridge/amd/amd8111/amd8111_ide.c b/src/southbridge/amd/amd8111/amd8111_ide.c
index a92274695d39e57265abcce8cdaf1bf1b5dabdaa..329987518789f84ff555bb60527a0ac12f0d3710 100644 (file)
--- a/src/southbridge/amd/amd8111/amd8111_ide.c
+++ b/src/southbridge/amd/amd8111/amd8111_ide.c
@@ -7,24 +7,24 @@
 
 static void ide_init(struct device *dev)
 {
-
+       struct southbridge_amd_amd8111_config *conf;
        /* Enable ide devices so the linux ide driver will work */
        uint16_t word;
        uint8_t byte;
-       int enable_a=1, enable_b=1;
+       conf = dev->chip_info;
 
        word = pci_read_config16(dev, 0x40);
        /* Ensure prefetch is disabled */
        word &= ~((1 << 15) | (1 << 13));
-       if (enable_b) {
+       if (conf->ide1_enable) {
                /* Enable secondary ide interface */
                word |= (1<<0);
-               printk_debug("IDE1 ");
+               printk(BIOS_DEBUG, "IDE1 ");
        }
-       if (enable_a) {
+       if (conf->ide0_enable) {
                /* Enable primary ide interface */
                word |= (1<<1);
-               printk_debug("IDE0 ");
+               printk(BIOS_DEBUG, "IDE0 ");
        }
 
        word |= (1<<12);
@@ -40,15 +40,25 @@ static void ide_init(struct device *dev)
        pci_write_config16(dev, 0x42, word);
 }
 
+static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+{
+       pci_write_config32(dev, 0x70,
+               ((device & 0xffff) << 16) | (vendor & 0xffff));
+}
+static struct pci_operations lops_pci = {
+       .set_subsystem = lpci_set_subsystem,
+};
 static struct device_operations ide_ops  = {
        .read_resources   = pci_dev_read_resources,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
        .init             = ide_init,
        .scan_bus         = 0,
+       .enable           = amd8111_enable,
+       .ops_pci          = &lops_pci
 };
 
-static struct pci_driver ide_driver __pci_driver = {
+static const struct pci_driver ide_driver __pci_driver = {
        .ops    = &ide_ops,
        .vendor = PCI_VENDOR_ID_AMD,
        .device = PCI_DEVICE_ID_AMD_8111_IDE,