printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / amd / sb600 / sb600_usb.c

diff --git a/src/southbridge/amd/sb600/sb600_usb.c b/src/southbridge/amd/sb600/sb600_usb.c
index 2002114f816e082210393f23cc136ff1c3999e46..b6e1fbec6b5e18fe6c07bf866cb936cae467e89d 100644 (file)
--- a/src/southbridge/amd/sb600/sb600_usb.c
+++ b/src/southbridge/amd/sb600/sb600_usb.c
@@ -88,26 +88,26 @@ static void usb_init2(struct device *dev)
        u8 byte;
        u16 word;
        u32 dword;
-       u8 *usb2_bar0;
+       u32 usb2_bar0;
        /* dword = pci_read_config32(dev, 0xf8); */
        /* dword |= 40; */
        /* pci_write_config32(dev, 0xf8, dword); */
 
-       usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF);
-       printk_info("usb2_bar0=%p\n", usb2_bar0);
+       usb2_bar0 = pci_read_config32(dev, 0x10) & ~0xFF;
+       printk(BIOS_INFO, "usb2_bar0=0x%x\n", usb2_bar0);
 
        /* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */
        dword = 0x00020F00;
-       writel(dword, usb2_bar0 + 0xC0);
+       write32(usb2_bar0 + 0xC0, dword);
 
        /* RPR5.5 Sets In/OUT FIFO threshold for best performance */
        dword = 0x00200040;
-       writel(dword, usb2_bar0 + 0xA4);
+       write32(usb2_bar0 + 0xA4, dword);
 
        /* RPR5.9 Disable the EHCI Dynamic Power Saving feature */
-       word = readl(usb2_bar0 + 0xBC);
+       word = read16(usb2_bar0 + 0xBC);
        word &= ~(1 << 12);
-       writew(word, usb2_bar0 + 0xBC);
+       write16(usb2_bar0 + 0xBC, word);
 
        /* RPR5.10 Disable EHCI MSI support */
        byte = pci_read_config8(dev, 0x50);
@@ -159,27 +159,27 @@ static struct device_operations usb_ops = {
        .ops_pci = &lops_pci,
 };
 
-static struct pci_driver usb_0_driver __pci_driver = {
+static const struct pci_driver usb_0_driver __pci_driver = {
        .ops = &usb_ops,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB_0,
 };
-static struct pci_driver usb_1_driver __pci_driver = {
+static const struct pci_driver usb_1_driver __pci_driver = {
        .ops = &usb_ops,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB_1,
 };
-static struct pci_driver usb_2_driver __pci_driver = {
+static const struct pci_driver usb_2_driver __pci_driver = {
        .ops = &usb_ops,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB_2,
 };
-static struct pci_driver usb_3_driver __pci_driver = {
+static const struct pci_driver usb_3_driver __pci_driver = {
        .ops = &usb_ops,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB_3,
 };
-static struct pci_driver usb_4_driver __pci_driver = {
+static const struct pci_driver usb_4_driver __pci_driver = {
        .ops = &usb_ops,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB_4,
@@ -195,7 +195,7 @@ static struct device_operations usb_ops2 = {
        .ops_pci = &lops_pci,
 };
 
-static struct pci_driver usb_5_driver __pci_driver = {
+static const struct pci_driver usb_5_driver __pci_driver = {
        .ops = &usb_ops2,
        .vendor = PCI_VENDOR_ID_ATI,
        .device = PCI_DEVICE_ID_ATI_SB600_USB2,