AMD-8111: Add TINY_BOOTBLOCK support.

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

diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 32797041f37de0736d13ed613f95f27e40eb2a72..2707ca6b4337f41075c8b764e919c6740d93bcb4 100644 (file)
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -11,29 +11,29 @@ void amd8111_enable(device_t dev)
        unsigned index;
        unsigned reg_old, reg;
 
-       /* See if we are on the behind the amd8111 pci bridge */
+       /* See if we are on the bus behind the amd8111 pci bridge */
        bus_dev = dev->bus->dev;
-       if ((bus_dev->vendor == PCI_VENDOR_ID_AMD) && 
-           (bus_dev->device == PCI_DEVICE_ID_AMD_8111_PCI)) 
+       if ((bus_dev->vendor == PCI_VENDOR_ID_AMD) &&
+           (bus_dev->device == PCI_DEVICE_ID_AMD_8111_PCI))
        {
                unsigned devfn;
-               devfn = bus_dev->path.u.pci.devfn + (1 << 3);
+               devfn = bus_dev->path.pci.devfn + (1 << 3);
                lpc_dev = dev_find_slot(bus_dev->bus->secondary, devfn);
-               index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8;
-               if (dev->path.u.pci.devfn == 2) { /* EHCI */
+               index = ((dev->path.pci.devfn & ~7) >> 3) + 8;
+               if (dev->path.pci.devfn == 2) { /* EHCI */
                        index = 16;
                }
        } else {
                unsigned devfn;
-               devfn = (dev->path.u.pci.devfn) & ~7;
+               devfn = (dev->path.pci.devfn) & ~7;
                lpc_dev = dev_find_slot(dev->bus->secondary, devfn);
-               index = dev->path.u.pci.devfn & 7;
+               index = dev->path.pci.devfn & 7;
        }
        if ((!lpc_dev) || (index >= 17)) {
                return;
        }
        if ((lpc_dev->vendor != PCI_VENDOR_ID_AMD) ||
-           (lpc_dev->device != PCI_DEVICE_ID_AMD_8111_ISA)) 
+           (lpc_dev->device != PCI_DEVICE_ID_AMD_8111_ISA))
        {
                uint32_t id;
                id = pci_read_config32(lpc_dev, PCI_VENDOR_ID);
@@ -65,8 +65,8 @@ void amd8111_enable(device_t dev)
 }
 
 struct chip_operations southbridge_amd_amd8111_ops = {
-       CHIP_NAME("AMD 8111")
-       /* This only called when this device is listed in the 
+       CHIP_NAME("AMD-8111 Southbridge")
+       /* This only called when this device is listed in the
        * static device tree.
        */
        .enable_dev = amd8111_enable,