printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / via / vt8235 / vt8235_lpc.c

diff --git a/src/southbridge/via/vt8235/vt8235_lpc.c b/src/southbridge/via/vt8235/vt8235_lpc.c
index 3e220940cdba8113ff3444cf793fad6de07c14ce..92ba973661fd60f08c275f961212a62d877d5d7c 100644 (file)
--- a/src/southbridge/via/vt8235/vt8235_lpc.c
+++ b/src/southbridge/via/vt8235/vt8235_lpc.c
@@ -7,7 +7,6 @@
 
 #include <pc80/mc146818rtc.h>
 
-#include "vt8235.h"
 #include "chip.h"
 
 /* The epia-m is really short on interrupts available, so PCI interupts A & D are ganged togther and so are B & C.
@@ -41,7 +40,7 @@ static const unsigned char slotPins[4] =     { 'B','C','D','A'};
 static const unsigned char firewirePins[4] = { 'B','C','D','A'};
 static const unsigned char vt8235Pins[4] =   { 'A','B','C','D'};
 static const unsigned char vgaPins[4] =      { 'A','B','C','D'};
-static const unsigned char cbPins[4] =       { 'D','A','B','C'};
+static const unsigned char cbPins[4] =       { 'A','B','C','D'};
 static const unsigned char riserPins[4] =    { 'A','B','C','D'};
 
 
@@ -57,7 +56,7 @@ static unsigned char *pin_to_irq(const unsigned char *pin)
 
 static void pci_routing_fixup(struct device *dev)
 {
-       printk_info("%s: dev is %p\n", __FUNCTION__, dev);
+       printk(BIOS_INFO, "%s: dev is %p\n", __func__, dev);
 
        /* set up PCI IRQ routing */
        pci_write_config8(dev, 0x55, pciIrqs[0] << 4);
@@ -66,38 +65,38 @@ static void pci_routing_fixup(struct device *dev)
 
 
        // firewire built into southbridge
-       printk_info("setting firewire\n");
+       printk(BIOS_INFO, "setting firewire\n");
        pci_assign_irqs(0, 0x0d, pin_to_irq(firewirePins));
 
        // Standard usb components
-       printk_info("setting usb\n");
+       printk(BIOS_INFO, "setting usb\n");
        pci_assign_irqs(0, 0x10, pin_to_irq(usbPins));
 
        // VT8235 + sound hardware
-       printk_info("setting vt8235\n");
+       printk(BIOS_INFO, "setting vt8235\n");
        pci_assign_irqs(0, 0x11, pin_to_irq(vt8235Pins));
 
        // Ethernet built into southbridge
-       printk_info("setting ethernet\n");
+       printk(BIOS_INFO, "setting ethernet\n");
        pci_assign_irqs(0, 0x12, pin_to_irq(enetPins));
 
        // VGA
-       printk_info("setting vga\n");
+       printk(BIOS_INFO, "setting vga\n");
        pci_assign_irqs(1, 0x00, pin_to_irq(vgaPins));
 
        // PCI slot
-       printk_info("setting pci slot\n");
+       printk(BIOS_INFO, "setting pci slot\n");
        pci_assign_irqs(0, 0x14, pin_to_irq(slotPins));
 
        // Cardbus slot 
-       printk_info("setting cardbus slot\n");
+       printk(BIOS_INFO, "setting cardbus slot\n");
        pci_assign_irqs(0, 0x0a, pin_to_irq(cbPins));
 
        // Via 2 slot riser card 2nd slot
-       printk_info("setting riser slot\n");
+       printk(BIOS_INFO, "setting riser slot\n");
        pci_assign_irqs(0, 0x13, pin_to_irq(riserPins));
 
-       printk_spew("%s: DONE\n", __FUNCTION__);
+       printk(BIOS_SPEW, "%s: DONE\n", __func__);
 }
 
 /* 
@@ -155,7 +154,7 @@ static void vt8235_init(struct device *dev)
 {
        unsigned char enables;
        
-       printk_debug("vt8235 init\n");
+       printk(BIOS_DEBUG, "vt8235 init\n");
 
        // enable the internal I/O decode
        enables = pci_read_config8(dev, 0x6C);
@@ -219,15 +218,22 @@ static void vt8235_init(struct device *dev)
    device has a resource to set - so set a dummy one */
 void vt8235_read_resources(device_t dev)
 {
+       struct resource *res;
 
-       struct resource *resource;
        pci_dev_read_resources(dev);
-       resource = new_resource(dev, 1);
-       resource->flags |= IORESOURCE_FIXED | IORESOURCE_ASSIGNED | IORESOURCE_IO | IORESOURCE_STORED;
-       resource->size = 2;
-       resource->base = 0x2e;
 
+       res = new_resource(dev, 1);
+       res->base = 0x0UL;
+       res->size = 0x400UL;
+       res->limit = 0xffffUL;
+       res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+
+       res = new_resource(dev, 3); /* IOAPIC */
+       res->base = 0xfec00000;
+       res->size = 0x00001000;
+       res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
 }
+
 void vt8235_set_resources(device_t dev)
 {
        struct resource *resource;
@@ -259,7 +265,7 @@ static struct device_operations vt8235_lpc_ops = {
        .scan_bus         = scan_static_bus,
 };
 
-static struct pci_driver lpc_driver __pci_driver = {
+static const struct pci_driver lpc_driver __pci_driver = {
        .ops    = &vt8235_lpc_ops,
        .vendor = PCI_VENDOR_ID_VIA,
        .device = PCI_DEVICE_ID_VIA_8235,