diff options
Diffstat (limited to 'src/southbridge/via/vt8235')
-rw-r--r-- | src/southbridge/via/vt8235/vt8235.c | 12 | ||||
-rw-r--r-- | src/southbridge/via/vt8235/vt8235_ide.c | 20 | ||||
-rw-r--r-- | src/southbridge/via/vt8235/vt8235_lpc.c | 22 | ||||
-rw-r--r-- | src/southbridge/via/vt8235/vt8235_nic.c | 2 | ||||
-rw-r--r-- | src/southbridge/via/vt8235/vt8235_usb.c | 2 |
5 files changed, 29 insertions, 29 deletions
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c index f384847d5c..228da0f948 100644 --- a/src/southbridge/via/vt8235/vt8235.c +++ b/src/southbridge/via/vt8235/vt8235.c @@ -14,7 +14,7 @@ static int enabled = 0; void hard_reset(void) { - printk_err("NO HARD RESET ON VT8235! FIX ME!\n"); + printk(BIOS_ERR, "NO HARD RESET ON VT8235! FIX ME!\n"); } static void keyboard_on(struct device *dev) @@ -34,11 +34,11 @@ void dump_south(device_t dev0) int i,j; for(i = 0; i < 256; i += 16) { - printk_debug("0x%x: ", i); + printk(BIOS_DEBUG, "0x%x: ", i); for(j = 0; j < 16; j++) { - printk_debug("%02x ", pci_read_config8(dev0, i+j)); + printk(BIOS_DEBUG, "%02x ", pci_read_config8(dev0, i+j)); } - printk_debug("\n"); + printk(BIOS_DEBUG, "\n"); } } @@ -61,7 +61,7 @@ static void vt8235_enable(struct device *dev) vendor = pci_read_config16(dev,0); model = pci_read_config16(dev,0x2); - printk_debug("In vt8235_enable %04x %04x.\n",vendor,model); + printk(BIOS_DEBUG, "In vt8235_enable %04x %04x.\n",vendor,model); /* if this is not the southbridge itself just return */ /* this is necessary because USB devices are slot 10, whereas this device is slot 11 @@ -70,7 +70,7 @@ static void vt8235_enable(struct device *dev) if( (vendor != PCI_VENDOR_ID_VIA) || (model != PCI_DEVICE_ID_VIA_8235)) return; - printk_debug("Initialising Devices\n"); + printk(BIOS_DEBUG, "Initialising Devices\n"); setup_i8259(); // make sure interupt controller is configured before keyboard init diff --git a/src/southbridge/via/vt8235/vt8235_ide.c b/src/southbridge/via/vt8235/vt8235_ide.c index 9c2af3c781..ec22f9053b 100644 --- a/src/southbridge/via/vt8235/vt8235_ide.c +++ b/src/southbridge/via/vt8235/vt8235_ide.c @@ -10,7 +10,7 @@ static void ide_init(struct device *dev) struct southbridge_via_vt8235_config *conf = dev->chip_info; unsigned char enables; - printk_info("Enabling VIA IDE.\n"); + printk(BIOS_INFO, "Enabling VIA IDE.\n"); /*if (!conf->enable_native_ide) { */ /* @@ -18,23 +18,23 @@ static void ide_init(struct device *dev) * use PCI interrupts. Using PCI ints confuses linux for some * reason. */ - printk_info("%s: enabling compatibility IDE addresses\n", + 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", + 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/vt8235/vt8235_lpc.c b/src/southbridge/via/vt8235/vt8235_lpc.c index 052c4c9415..92ba973661 100644 --- a/src/southbridge/via/vt8235/vt8235_lpc.c +++ b/src/southbridge/via/vt8235/vt8235_lpc.c @@ -56,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", __func__, dev); + printk(BIOS_INFO, "%s: dev is %p\n", __func__, dev); /* set up PCI IRQ routing */ pci_write_config8(dev, 0x55, pciIrqs[0] << 4); @@ -65,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", __func__); + printk(BIOS_SPEW, "%s: DONE\n", __func__); } /* @@ -154,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); diff --git a/src/southbridge/via/vt8235/vt8235_nic.c b/src/southbridge/via/vt8235/vt8235_nic.c index 09ea17e078..86fef895de 100644 --- a/src/southbridge/via/vt8235/vt8235_nic.c +++ b/src/southbridge/via/vt8235/vt8235_nic.c @@ -12,7 +12,7 @@ static void nic_init(struct device *dev) { uint8_t byte; - printk_debug("Configuring VIA Rhine LAN\n"); + printk(BIOS_DEBUG, "Configuring VIA Rhine LAN\n"); /* We don't need stepping - though the device supports it */ byte = pci_read_config8(dev, PCI_COMMAND); diff --git a/src/southbridge/via/vt8235/vt8235_usb.c b/src/southbridge/via/vt8235/vt8235_usb.c index 2318465058..8b2a685807 100644 --- a/src/southbridge/via/vt8235/vt8235_usb.c +++ b/src/southbridge/via/vt8235/vt8235_usb.c @@ -9,7 +9,7 @@ static void usb_init(struct device *dev) { - printk_debug("Configuring VIA USB 1.1\n"); + printk(BIOS_DEBUG, "Configuring VIA USB 1.1\n"); /* pci_write_config8(dev, 0x04, 0x07); */ |