printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / via / vt8231 / vt8231_lpc.c

diff --git a/src/southbridge/via/vt8231/vt8231_lpc.c b/src/southbridge/via/vt8231/vt8231_lpc.c
index 4b906359b08feee0fc085c0619fb2f6a088821d6..9799195d87acc990404248b3636e210e6b63ad1f 100644 (file)
--- a/src/southbridge/via/vt8231/vt8231_lpc.c
+++ b/src/southbridge/via/vt8231/vt8231_lpc.c
@@ -6,7 +6,6 @@
 
 #include <pc80/mc146818rtc.h>
 
-#include "vt8231.h"
 #include "chip.h"
 
 /* PIRQ init
@@ -24,7 +23,7 @@ static const unsigned char slotIrqs[4] = { 5, 10, 12, 11 };
 static void pci_routing_fixup(struct device *dev)
 {
 
-       printk_info("%s: dev is %p\n", __func__, dev);
+       printk(BIOS_INFO, "%s: dev is %p\n", __func__, dev);
        if (dev) {
                /* initialize PCI interupts - these assignments depend
                   on the PCB routing of PINTA-D 
@@ -40,17 +39,17 @@ static void pci_routing_fixup(struct device *dev)
        }
 
        // Standard southbridge components
-       printk_info("setting southbridge\n");
+       printk(BIOS_INFO, "setting southbridge\n");
        pci_assign_irqs(0, 0x11, southbridgeIrqs);
 
        // Ethernet built into southbridge
-       printk_info("setting ethernet\n");
+       printk(BIOS_INFO, "setting ethernet\n");
        pci_assign_irqs(0, 0x12, enetIrqs);
 
        // PCI slot
-       printk_info("setting pci slot\n");
+       printk(BIOS_INFO, "setting pci slot\n");
        pci_assign_irqs(0, 0x14, slotIrqs);
-       printk_info("%s: DONE\n", __func__);
+       printk(BIOS_INFO, "%s: DONE\n", __func__);
 }
 
 static void vt8231_init(struct device *dev)
@@ -58,7 +57,7 @@ static void vt8231_init(struct device *dev)
        unsigned char enables;
        struct southbridge_via_vt8231_config *conf = dev->chip_info;
 
-       printk_debug("vt8231 init\n");
+       printk(BIOS_DEBUG, "vt8231 init\n");
 
        // enable the internal I/O decode
        enables = pci_read_config8(dev, 0x6C);
@@ -103,18 +102,18 @@ static void vt8231_init(struct device *dev)
        // First do some more things to devfn (17,0)
        // note: this should already be cleared, according to the book. 
        enables = pci_read_config8(dev, 0x50);
-       printk_debug("IDE enable in reg. 50 is 0x%x\n", enables);
+       printk(BIOS_DEBUG, "IDE enable in reg. 50 is 0x%x\n", enables);
        enables &= ~8; // need manifest constant here!
-       printk_debug("set IDE reg. 50 to 0x%x\n", enables);
+       printk(BIOS_DEBUG, "set IDE reg. 50 to 0x%x\n", enables);
        pci_write_config8(dev, 0x50, enables);
        
        // set default interrupt values (IDE)
        enables = pci_read_config8(dev, 0x4c);
-       printk_debug("IRQs in reg. 4c are 0x%x\n", enables & 0xf);
+       printk(BIOS_DEBUG, "IRQs in reg. 4c are 0x%x\n", enables & 0xf);
        // clear out whatever was there. 
        enables &= ~0xf;
        enables |= 4;
-       printk_debug("setting reg. 4c to 0x%x\n", enables);
+       printk(BIOS_DEBUG, "setting reg. 4c to 0x%x\n", enables);
        pci_write_config8(dev, 0x4c, enables);
        
        // set up the serial port interrupts. 
@@ -131,6 +130,24 @@ static void vt8231_init(struct device *dev)
        rtc_init(0);
 }
 
+void vt8231_read_resources(device_t dev)
+{
+       struct resource *res;
+
+       pci_dev_read_resources(dev);
+
+       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;
+}
+
 static void southbridge_init(struct device *dev)
 {
        vt8231_init(dev);
@@ -138,7 +155,7 @@ static void southbridge_init(struct device *dev)
 }
 
 static struct device_operations vt8231_lpc_ops = {
-       .read_resources   = pci_dev_read_resources,
+       .read_resources   = vt8231_read_resources,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
        .init             = &southbridge_init,