diff options
Diffstat (limited to 'src/southbridge/via/vt8231')
| -rw-r--r-- | src/southbridge/via/vt8231/vt8231.c | 2 | ||||
| -rw-r--r-- | src/southbridge/via/vt8231/vt8231_acpi.c | 2 | ||||
| -rw-r--r-- | src/southbridge/via/vt8231/vt8231_ide.c | 18 | ||||
| -rw-r--r-- | src/southbridge/via/vt8231/vt8231_lpc.c | 20 | ||||
| -rw-r--r-- | src/southbridge/via/vt8231/vt8231_nic.c | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c index 5f8ab45009..f943524665 100644 --- a/src/southbridge/via/vt8231/vt8231.c +++ b/src/southbridge/via/vt8231/vt8231.c @@ -14,7 +14,7 @@ static device_t lpc_dev; void hard_reset(void) { - printk_err("NO HARD RESET ON VT8231! FIX ME!\n"); + printk(BIOS_ERR, "NO HARD RESET ON VT8231! FIX ME!\n"); } static void keyboard_on(void) diff --git a/src/southbridge/via/vt8231/vt8231_acpi.c b/src/southbridge/via/vt8231/vt8231_acpi.c index 87c5e876fd..6cbf4c591f 100644 --- a/src/southbridge/via/vt8231/vt8231_acpi.c +++ b/src/southbridge/via/vt8231/vt8231_acpi.c @@ -6,7 +6,7 @@ static void acpi_init(struct device *dev) { - printk_debug("Configuring VIA ACPI\n"); + printk(BIOS_DEBUG, "Configuring VIA ACPI\n"); // Set ACPI base address to IO 0x4000 pci_write_config32(dev, 0x48, 0x4001); diff --git a/src/southbridge/via/vt8231/vt8231_ide.c b/src/southbridge/via/vt8231/vt8231_ide.c index a151ca06c9..c1df5ef5cd 100644 --- a/src/southbridge/via/vt8231/vt8231_ide.c +++ b/src/southbridge/via/vt8231/vt8231_ide.c @@ -19,22 +19,22 @@ static void ide_init(struct device *dev) */ /* - printk_info("%s: enabling compatibility IDE addresses\n", __func__); + printk(BIOS_INFO, "%s: enabling compatibility IDE addresses\n", __func__); enables = pci_read_config8(dev, 0x42); - printk_debug("enables in reg 0x42 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x42 0x%x\n", enables); enables &= ~0xc0; // compatability mode pci_write_config8(dev, 0x42, enables); enables = pci_read_config8(dev, 0x42); - printk_debug("enables in reg 0x42 read back as 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x42 read back as 0x%x\n", enables); */ } enables = pci_read_config8(dev, 0x40); - printk_debug("enables in reg 0x40 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x40 0x%x\n", enables); enables |= 3; pci_write_config8(dev, 0x40, enables); enables = pci_read_config8(dev, 0x40); - printk_debug("enables in reg 0x40 read back as 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x40 read back as 0x%x\n", enables); // Enable prefetch buffers enables = pci_read_config8(dev, 0x41); @@ -58,7 +58,7 @@ static void ide_init(struct device *dev) // kevinh@ispiri.com - the standard linux drivers seem ass slow when // used in native mode - I've changed back to classic enables = pci_read_config8(dev, 0x9); - printk_debug("enables in reg 0x9 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x9 0x%x\n", enables); // by the book, set the low-order nibble to 0xa. if (conf->enable_native_ide) { enables &= ~0xf; @@ -70,11 +70,11 @@ static void ide_init(struct device *dev) pci_write_config8(dev, 0x9, enables); enables = pci_read_config8(dev, 0x9); - printk_debug("enables in reg 0x9 read back as 0x%x\n", enables); + printk(BIOS_DEBUG, "enables in reg 0x9 read back as 0x%x\n", enables); // standard bios sets master bit. enables = pci_read_config8(dev, 0x4); - printk_debug("command in reg 0x4 0x%x\n", enables); + printk(BIOS_DEBUG, "command in reg 0x4 0x%x\n", enables); enables |= 7; // No need for stepping - kevinh@ispiri.com @@ -82,7 +82,7 @@ static void ide_init(struct device *dev) pci_write_config8(dev, 0x4, enables); enables = pci_read_config8(dev, 0x4); - printk_debug("command in reg 0x4 reads back as 0x%x\n", enables); + printk(BIOS_DEBUG, "command in reg 0x4 reads back as 0x%x\n", enables); if (!conf->enable_native_ide) { // Use compatability mode - per award bios diff --git a/src/southbridge/via/vt8231/vt8231_lpc.c b/src/southbridge/via/vt8231/vt8231_lpc.c index cee46b51bb..9799195d87 100644 --- a/src/southbridge/via/vt8231/vt8231_lpc.c +++ b/src/southbridge/via/vt8231/vt8231_lpc.c @@ -23,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 @@ -39,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) @@ -57,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); @@ -102,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. diff --git a/src/southbridge/via/vt8231/vt8231_nic.c b/src/southbridge/via/vt8231/vt8231_nic.c index 828cdaf2f6..d4771f6816 100644 --- a/src/southbridge/via/vt8231/vt8231_nic.c +++ b/src/southbridge/via/vt8231/vt8231_nic.c @@ -12,7 +12,7 @@ static void nic_init(struct device *dev) { uint8_t byte; - printk_debug("Configuring VIA LAN\n"); + printk(BIOS_DEBUG, "Configuring VIA LAN\n"); /* We don't need stepping - though the device supports it */ byte = pci_read_config8(dev, PCI_COMMAND); |