aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/renesas/rts7751r2d
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 02:16:42 -0400
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 02:16:42 -0400
commitd7cdc9e8ac82c43fdcd4fde6b5b53d2dcba7f707 (patch)
tree2489b1831a1b5818af0927e4d3c8933bf7d05f31 /arch/sh/boards/renesas/rts7751r2d
parent26ff6c11ef38e08990c1e417c299246e6ab18ff7 (diff)
sh: ioremap() overhaul.
ioremap() overhaul. Add support for transparent PMB mapping, get rid of p3_ioremap(), etc. Also drop ioremap() and iounmap() routines from the machvec, as everyone can use the generic ioremap() API instead. For PCI memory apertures and other special cases, use the pci_iomap() API, as boards are already required to get the mapping right there. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/renesas/rts7751r2d')
-rw-r--r--arch/sh/boards/renesas/rts7751r2d/io.c9
-rw-r--r--arch/sh/boards/renesas/rts7751r2d/mach.c2
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/sh/boards/renesas/rts7751r2d/io.c b/arch/sh/boards/renesas/rts7751r2d/io.c
index 9e7fa726a86d..8dc2a2e2e5df 100644
--- a/arch/sh/boards/renesas/rts7751r2d/io.c
+++ b/arch/sh/boards/renesas/rts7751r2d/io.c
@@ -321,15 +321,6 @@ void rts7751r2d_outsl(unsigned long port, const void *addr, unsigned long count)
321 maybebadio(port); 321 maybebadio(port);
322} 322}
323 323
324void *rts7751r2d_ioremap(unsigned long offset, unsigned long size)
325{
326 if (offset >= 0xfd000000)
327 return (void *)offset;
328 else
329 return (void *)P2SEGADDR(offset);
330}
331EXPORT_SYMBOL(rts7751r2d_ioremap);
332
333unsigned long rts7751r2d_isa_port2addr(unsigned long offset) 324unsigned long rts7751r2d_isa_port2addr(unsigned long offset)
334{ 325{
335 return port2adr(offset); 326 return port2adr(offset);
diff --git a/arch/sh/boards/renesas/rts7751r2d/mach.c b/arch/sh/boards/renesas/rts7751r2d/mach.c
index 175a93d726e8..fe3e8735e9f8 100644
--- a/arch/sh/boards/renesas/rts7751r2d/mach.c
+++ b/arch/sh/boards/renesas/rts7751r2d/mach.c
@@ -19,7 +19,6 @@
19 19
20extern void heartbeat_rts7751r2d(void); 20extern void heartbeat_rts7751r2d(void);
21extern void init_rts7751r2d_IRQ(void); 21extern void init_rts7751r2d_IRQ(void);
22extern void *rts7751r2d_ioremap(unsigned long, unsigned long);
23extern int rts7751r2d_irq_demux(int irq); 22extern int rts7751r2d_irq_demux(int irq);
24 23
25extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t); 24extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
@@ -53,7 +52,6 @@ struct sh_machine_vector mv_rts7751r2d __initmv = {
53 .mv_outsw = rts7751r2d_outsw, 52 .mv_outsw = rts7751r2d_outsw,
54 .mv_outsl = rts7751r2d_outsl, 53 .mv_outsl = rts7751r2d_outsl,
55 54
56 .mv_ioremap = rts7751r2d_ioremap,
57 .mv_init_irq = init_rts7751r2d_IRQ, 55 .mv_init_irq = init_rts7751r2d_IRQ,
58#ifdef CONFIG_HEARTBEAT 56#ifdef CONFIG_HEARTBEAT
59 .mv_heartbeat = heartbeat_rts7751r2d, 57 .mv_heartbeat = heartbeat_rts7751r2d,