diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-01-16 17:53:38 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-01-16 17:53:38 +0000 |
| commit | 9fe4d797a37671a65053add3f7cca27397db0b9b (patch) | |
| tree | 5cabbdc8b6e7eb970891b55d1ea3727a4a71aca2 /src/southbridge/nvidia/mcp55/mcp55_aza.c | |
| parent | 984e0f3a0c3a82339ef8afcf7f315f377e0c81fc (diff) | |
| download | coreboot-9fe4d797a37671a65053add3f7cca27397db0b9b.tar.xz | |
coreboot used to have two different "APIs" for memory accesses:
read32(unsigned long addr) vs readl(void *addr)
and
write32(unsigned long addr, uint32_t value) vs writel(uint32_t value, void *addr)
read32 was only available in __PRE_RAM__ stage, while readl was used in stage2.
Some unclean implementations then made readl available to __PRE_RAM__ too which
results in really messy includes and code.
This patch fixes all code to use the read32/write32 variant, so that we can
remove readl/writel in another patch.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5022 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/southbridge/nvidia/mcp55/mcp55_aza.c')
| -rw-r--r-- | src/southbridge/nvidia/mcp55/mcp55_aza.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/southbridge/nvidia/mcp55/mcp55_aza.c b/src/southbridge/nvidia/mcp55/mcp55_aza.c index b43c8fd281..b86530b7af 100644 --- 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,7 +74,7 @@ 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 */ @@ -173,17 +173,17 @@ 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); @@ -198,13 +198,13 @@ static void codec_init(uint8_t *base, int addr) /* 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"); |