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

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

diff --git a/src/southbridge/amd/amd8111/amd8111_usb.c b/src/southbridge/amd/amd8111/amd8111_usb.c
index 669b828e551e55ff29bd0b24c0944953dd10591f..13dccf435b97583dc17d34fef134900ab999f1a3 100644 (file)
--- a/src/southbridge/amd/amd8111/amd8111_usb.c
+++ b/src/southbridge/amd/amd8111/amd8111_usb.c
@@ -1,37 +1,37 @@
+/*
+ * (C) 2004 Linux Networx
+ */
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
+#include <arch/io.h>
 #include "amd8111.h"
 
-static void usb_init(struct device *dev)
-{
-#if 0
-       uint32_t cmd;
-
-       printk_debug("USB: Setting up controller.. ");
-       cmd = pci_read_config32(dev, PCI_COMMAND);
-       pci_write_config32(dev, PCI_COMMAND, 
-               cmd | PCI_COMMAND_IO | PCI_COMMAND_MEMORY | 
-               PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE);
 
-       printk_debug("done.\n");
-#endif
+static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+{
+       pci_write_config32(dev, 0x70,
+               ((device & 0xffff) << 16) | (vendor & 0xffff));
 }
 
-static struct device_operations usb_ops  = {
+static struct pci_operations lops_pci = {
+       .set_subsystem = lpci_set_subsystem,
+};
+
+static struct device_operations usb_ops = {
        .read_resources   = pci_dev_read_resources,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
-       .init             = usb_init,
-       .scan_bus         = 0,
-       .enable           = amd8111_enable,
+       .init             = 0,
+       .scan_bus         = scan_static_bus,
+//     .enable           = amd8111_enable,
+       .ops_pci          = &lops_pci,
 };
 
-static struct pci_driver usb_driver __pci_driver = {
+static const struct pci_driver usb_driver __pci_driver = {
        .ops    = &usb_ops,
        .vendor = PCI_VENDOR_ID_AMD,
        .device = PCI_DEVICE_ID_AMD_8111_USB,
 };
-