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>

2 files changed, 1 insertions, 9 deletions

diff --git a/arch/sh/boards/titan/io.c b/arch/sh/boards/titan/io.c
index d66900c99a11..b886fd233a66 100644
--- a/arch/sh/boards/titan/io.c
+++ b/arch/sh/boards/titan/io.c
@@ -138,19 +138,12 @@ void titan_outsl(unsigned long port, const void *src, unsigned long count)
         maybebadio(port);
 }
 
-void *titan_ioremap(unsigned long offset, unsigned long size) {
-        if (CHECK_SH7751_PCIIO(offset) || CHECK_SH7751_PCIMEMIO(offset))
-                return (void *)offset;
-}
-
 void __iomem *titan_ioport_map(unsigned long port, unsigned int size)
 {
-        if (PXSEG(port))
+        if (PXSEG(port) || CHECK_SH7751_PCIMEMIO(port))
                 return (void __iomem *)port;
         else if (CHECK_SH7751_PCIIO(port))
                 return (void __iomem *)PCI_IOMAP(port);
 
         return (void __iomem *)port2adr(port);
 }
-
-EXPORT_SYMBOL(titan_ioremap);
diff --git a/arch/sh/boards/titan/setup.c b/arch/sh/boards/titan/setup.c
index 6ac5c8d7b3fb..c8b431c1d0fd 100644
--- a/arch/sh/boards/titan/setup.c
+++ b/arch/sh/boards/titan/setup.c
@@ -51,7 +51,6 @@ struct sh_machine_vector mv_titan __initmv = {
         .mv_insl =      titan_insl,
         .mv_outsl =     titan_outsl,
 
-        .mv_ioremap =   titan_ioremap,
         .mv_ioport_map = titan_ioport_map,
 
         .mv_init_irq =  init_titan_irq,