printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / nvidia / mcp55 / mcp55_aza.c

diff --git a/src/southbridge/nvidia/mcp55/mcp55_aza.c b/src/southbridge/nvidia/mcp55/mcp55_aza.c
index b43c8fd281ed4de12e76560f22fde2e5a2ab5e95..cea0b49e8c924a82c72b1e4d5413486bdbdff78f 100644 (file)
--- a/src/southbridge/nvidia/mcp55/mcp55_aza.c
+++ b/src/southbridge/nvidia/mcp55/mcp55_aza.c
@@ -36,14 +36,14 @@ static int set_bits(uint8_t *port, uint32_t mask, uint32_t val)
        int count;
 
        val &= mask;
-       dword = readl(port);
+       dword = read32(port);
        dword &= ~mask;
        dword |= val;
-       writel(dword, port);
+       write32(port, dword);
 
        count = 50;
        do {
-               dword = readl(port);
+               dword = read32(port);
                dword &= mask;
                udelay(100);
        } while ((dword != val) && --count);
@@ -63,9 +63,9 @@ static int codec_detect(uint8_t *base)
        set_bits(base + 0x08, 1, 1);
 
        /* 2 */
-       dword = readl(base + 0x0e);
+       dword = read32(base + 0x0e);
        dword |= 7;
-       writel(dword, base + 0x0e);
+       write32(base + 0x0e, dword);
 
        /* 3 */
        set_bits(base + 0x08, 1, 0);
@@ -74,13 +74,13 @@ static int codec_detect(uint8_t *base)
        set_bits(base + 0x08, 1, 1);
 
        /* 5 */
-       dword = readl(base + 0xe);
+       dword = read32(base + 0xe);
        dword &= 7;
 
        /* 6 */
        if(!dword) {
                set_bits(base + 0x08, 1, 0);
-               printk_debug("No codec!\n");
+               printk(BIOS_DEBUG, "No codec!\n");
                return 0;
        }
        return dword;
@@ -173,41 +173,41 @@ static void codec_init(uint8_t *base, int addr)
 
        /* 1 */
        do {
-               dword = readl(base + 0x68);
+               dword = read32(base + 0x68);
        } while (dword & 1);
 
        dword = (addr<<28) | 0x000f0000;
-       writel(dword, base + 0x60);
+       write32(base + 0x60, dword);
 
        do {
-               dword = readl(base + 0x68);
+               dword = read32(base + 0x68);
        } while ((dword & 3)!=2);
 
-       dword = readl(base + 0x64);
+       dword = read32(base + 0x64);
 
        /* 2 */
-       printk_debug("codec viddid: %08x\n", dword);
+       printk(BIOS_DEBUG, "codec viddid: %08x\n", dword);
        verb_size = find_verb(dword, &verb);
 
        if(!verb_size) {
-               printk_debug("No verb!\n");
+               printk(BIOS_DEBUG, "No verb!\n");
                return;
        }
 
-       printk_debug("verb_size: %d\n", verb_size);
+       printk(BIOS_DEBUG, "verb_size: %d\n", verb_size);
        /* 3 */
        for(i=0; i<verb_size; i++) {
                do {
-                       dword = readl(base + 0x68);
+                       dword = read32(base + 0x68);
                } while (dword & 1);
 
-               writel(verb[i], base + 0x60);
+               write32(base + 0x60, verb[i]);
 
                do {
-                       dword = readl(base + 0x68);
+                       dword = read32(base + 0x68);
                } while ((dword & 3) != 2);
        }
-       printk_debug("verb loaded!\n");
+       printk(BIOS_DEBUG, "verb loaded!\n");
 }
 
 static void codecs_init(uint8_t *base, uint32_t codec_mask)
@@ -230,12 +230,12 @@ static void aza_init(struct device *dev)
                return;
 
        base =(uint8_t *) res->base;
-       printk_debug("base = %08x\n", base);
+       printk(BIOS_DEBUG, "base = %08x\n", base);
 
        codec_mask = codec_detect(base);
 
        if(codec_mask) {
-               printk_debug("codec_mask = %02x\n", codec_mask);
+               printk(BIOS_DEBUG, "codec_mask = %02x\n", codec_mask);
                codecs_init(base, codec_mask);
        }
 }