diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-10-12 23:35:30 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-12 23:35:30 -0400 |
commit | 913df4453f85f1fe79b35ecf3c9a0c0b707d22a2 (patch) | |
tree | 5dc6b793a0198ac5f9dd78be99e0ec292edf8d1d /drivers/sh | |
parent | 54d5102fac3dd4034104e1b38a44a873d5f3a8d3 (diff) |
sh: maple: PHYSADDR() -> virt_to_phys() conversion.
Maple's abuse of PHYSADDR() likewise can be converted to virt_to_phys()
for its cases, although in practice this really wants explicit remapping.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/maple/maple.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c index 93c20e135ee1..4e8f57d4131f 100644 --- a/drivers/sh/maple/maple.c +++ b/drivers/sh/maple/maple.c | |||
@@ -106,7 +106,7 @@ static void maple_dma_reset(void) | |||
106 | * max delay is 11 | 106 | * max delay is 11 |
107 | */ | 107 | */ |
108 | ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED); | 108 | ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED); |
109 | ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR); | 109 | ctrl_outl(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR); |
110 | ctrl_outl(1, MAPLE_ENABLE); | 110 | ctrl_outl(1, MAPLE_ENABLE); |
111 | } | 111 | } |
112 | 112 | ||
@@ -258,7 +258,7 @@ static void maple_build_block(struct mapleq *mq) | |||
258 | maple_lastptr = maple_sendptr; | 258 | maple_lastptr = maple_sendptr; |
259 | 259 | ||
260 | *maple_sendptr++ = (port << 16) | len | 0x80000000; | 260 | *maple_sendptr++ = (port << 16) | len | 0x80000000; |
261 | *maple_sendptr++ = PHYSADDR(mq->recvbuf->buf); | 261 | *maple_sendptr++ = virt_to_phys(mq->recvbuf->buf); |
262 | *maple_sendptr++ = | 262 | *maple_sendptr++ = |
263 | mq->command | (to << 8) | (from << 16) | (len << 24); | 263 | mq->command | (to << 8) | (from << 16) | (len << 24); |
264 | while (len-- > 0) | 264 | while (len-- > 0) |