back out immature amd8111_enable stuff

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1555 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 2 insertions, 66 deletions

diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 74f69ee88d..2c5d1e80fe 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -13,75 +13,12 @@ void amd8111_enable(device_t dev)
 	uint16_t reg_old, reg;
 	uint8_t byte;
 
-	{
-	    uint16_t vendor, device;
-	    vendor = pci_read_config16(dev, PCI_VENDOR_ID);
-	    device = pci_read_config16(dev, PCI_DEVICE_ID);
-	    printk_debug("%s: %s %s [%x/%x]\n", __FUNCTION__,
-			 dev->enabled? "enabling" : "disabling", dev_path(dev),
-			 vendor, device);
-	}
-
-	/* See if we are on the 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)) {
-		unsigned devfn;
-		devfn = bus_dev->path.u.pci.devfn + (1 << 3);
-		// devnf = devfn + DEVFN(1,0);
-		lpc_dev = dev_find_slot(bus_dev->bus->secondary, devfn);
-		index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8;
-	} else {
-		unsigned devfn;
-		devfn = (dev->path.u.pci.devfn) & ~7;
-		lpc_dev = dev_find_slot(dev->bus->secondary, devfn);
-		index = dev->path.u.pci.devfn & 7;
-	}
-
-	if ((!lpc_dev) || (index >= 16)) {
-		return;
-	}
-	if ((lpc_dev->vendor != PCI_VENDOR_ID_AMD) ||
-	    (lpc_dev->device != PCI_DEVICE_ID_AMD_8111_ISA)) {
-		uint32_t id;
-		id = pci_read_config32(lpc_dev, PCI_VENDOR_ID);
-		if (id != (PCI_VENDOR_ID_AMD | (PCI_DEVICE_ID_AMD_8111_ISA << 16))) {
-			return;
-		}
-	}
-	reg = reg_old = pci_read_config16(lpc_dev, 0x48);
-	reg &= ~(1 << index);
-	if (dev->enabled) {
-		reg |= (1 << index);
-	}
-	if (reg != reg_old) {
-		pci_write_config16(lpc_dev, 0x48, reg);
-	}
-}
-
-void amd8111_enable_dev(device_t dev)
-{
-	device_t lpc_dev;
-	device_t bus_dev;
-	unsigned index;
-	uint16_t reg_old, reg;
-
-	{
-	    uint16_t vendor, device;
-	    vendor = pci_read_config16(dev, PCI_VENDOR_ID);
-	    device = pci_read_config16(dev, PCI_DEVICE_ID);
-	    printk_debug("%s: %s %s [%x/%x]\n", __FUNCTION__,
-			 dev->enabled? "enabling" : "disabling", dev_path(dev),
-			 vendor, device);
-	}
-
 	/* See if we are on the 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)) {
 		unsigned devfn;
 		devfn = bus_dev->path.u.pci.devfn + (1 << 3);
-		// devnf = devfn + DEVFN(1,0);
 		lpc_dev = dev_find_slot(bus_dev->bus->secondary, devfn);
 		index = ((dev->path.u.pci.devfn & ~7) >> 3) + 8;
 	} else {
@@ -105,8 +42,7 @@ void amd8111_enable_dev(device_t dev)
 
         if ((dev->vendor == PCI_VENDOR_ID_AMD) &&
             (dev->device == PCI_DEVICE_ID_AMD_8111_USB2)) {
-		if (!dev->enabled) {
-			uint8_t byte;
+		if(!dev->enabled) {
 		        byte = pci_read_config8(lpc_dev, 0x47);
 		        byte |= (1<<7);
 		        pci_write_config8(lpc_dev, 0x47, byte);
@@ -128,5 +64,5 @@ void amd8111_enable_dev(device_t dev)
 
 struct chip_control southbridge_amd_amd8111_control = {
 	.name       = "AMD 8111 Southbridge",
-	.enable_dev = amd8111_enable_dev,
+	.enable_dev = amd8111_enable,
 };