summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-13 05:35:30 +0200
committerPaul Mundt <lethal@linux-sh.org>2009-10-13 05:35:30 +0200
commit913df4453f85f1fe79b35ecf3c9a0c0b707d22a2 (patch)
tree5dc6b793a0198ac5f9dd78be99e0ec292edf8d1d
parentcdrom: gdrom: Kill off PHYSADDR use. (diff)
downloadlinux-913df4453f85f1fe79b35ecf3c9a0c0b707d22a2.tar.xz
linux-913df4453f85f1fe79b35ecf3c9a0c0b707d22a2.zip
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>
-rw-r--r--drivers/sh/maple/maple.c4
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)
* max delay is 11
*/
ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED);
- ctrl_outl(PHYSADDR(maple_sendbuf), MAPLE_DMAADDR);
+ ctrl_outl(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR);
ctrl_outl(1, MAPLE_ENABLE);
}
@@ -258,7 +258,7 @@ static void maple_build_block(struct mapleq *mq)
maple_lastptr = maple_sendptr;
*maple_sendptr++ = (port << 16) | len | 0x80000000;
- *maple_sendptr++ = PHYSADDR(mq->recvbuf->buf);
+ *maple_sendptr++ = virt_to_phys(mq->recvbuf->buf);
*maple_sendptr++ =
mq->command | (to << 8) | (from << 16) | (len << 24);
while (len-- > 0)