5 files changed, 3 insertions, 136 deletions

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 30c80fd29058..588579ac2e35 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -149,7 +149,6 @@ machdir-$(CONFIG_SH_X3PROTO)			+= mach-x3proto
 machdir-$(CONFIG_SH_SH7763RDP)                  += mach-sh7763rdp
 machdir-$(CONFIG_SH_SH4202_MICRODEV)            += mach-microdev
 machdir-$(CONFIG_SH_LANDISK)                    += mach-landisk
-machdir-$(CONFIG_SH_TITAN)                      += mach-titan
 machdir-$(CONFIG_SH_LBOX_RE2)                   += mach-lboxre2
 machdir-$(CONFIG_SH_CAYMAN)                     += mach-cayman
 machdir-$(CONFIG_SH_RSK)                        += mach-rsk
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile
index ce0f26381784..4f90f9b7a922 100644
--- a/arch/sh/boards/Makefile
+++ b/arch/sh/boards/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_SH_SHMIN)		+= board-shmin.o
 obj-$(CONFIG_SH_EDOSK7760)      += board-edosk7760.o
 obj-$(CONFIG_SH_ESPT)           += board-espt.o
 obj-$(CONFIG_SH_POLARIS)        += board-polaris.o
+obj-$(CONFIG_SH_TITAN)          += board-titan.o
diff --git a/arch/sh/boards/mach-titan/setup.c b/arch/sh/boards/board-titan.c
index 81e7e0f03863..94c36c7bc0b3 100644
--- a/arch/sh/boards/mach-titan/setup.c
+++ b/arch/sh/boards/board-titan.c
@@ -19,26 +19,6 @@ static void __init init_titan_irq(void)
 }
 
 static struct sh_machine_vector mv_titan __initmv = {
-        .mv_name =      "Titan",
-
-        .mv_inb =       titan_inb,
-        .mv_inw =       titan_inw,
-        .mv_inl =       titan_inl,
-        .mv_outb =      titan_outb,
-        .mv_outw =      titan_outw,
-        .mv_outl =      titan_outl,
-
-        .mv_inb_p =     titan_inb_p,
-        .mv_inw_p =     titan_inw,
-        .mv_inl_p =     titan_inl,
-        .mv_outb_p =    titan_outb_p,
-        .mv_outw_p =    titan_outw,
-        .mv_outl_p =    titan_outl,
-
-        .mv_insl =      titan_insl,
-        .mv_outsl =     titan_outsl,
-
-        .mv_ioport_map = titan_ioport_map,
-
-        .mv_init_irq =  init_titan_irq,
+        .mv_name        = "Titan",
+        .mv_init_irq    = init_titan_irq,
 };
diff --git a/arch/sh/boards/mach-titan/Makefile b/arch/sh/boards/mach-titan/Makefile
deleted file mode 100644
index 08d753700062..000000000000
--- a/arch/sh/boards/mach-titan/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the Nimble Microsystems TITAN specific parts of the kernel
-#
-
-obj-y    := setup.o io.o
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c
deleted file mode 100644
index 29754c5091f0..000000000000
--- a/arch/sh/boards/mach-titan/io.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *      I/O routines for Titan
- */
-#include <linux/pci.h>
-#include <asm/machvec.h>
-#include <asm/addrspace.h>
-#include <mach/titan.h>
-#include <asm/io.h>
-
-static inline unsigned int port2adr(unsigned int port)
-{
-        maybebadio((unsigned long)port);
-        return port;
-}
-
-u8 titan_inb(unsigned long port)
-{
-        if (PXSEG(port))
-                return __raw_readb(port);
-        return __raw_readw(port2adr(port)) & 0xff;
-}
-
-u8 titan_inb_p(unsigned long port)
-{
-        u8 v;
-
-        if (PXSEG(port))
-                v = __raw_readb(port);
-        else
-                v = __raw_readw(port2adr(port)) & 0xff;
-        ctrl_delay();
-        return v;
-}
-
-u16 titan_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return __raw_readw(port);
-        else if (port >= 0x2000)
-                return __raw_readw(port2adr(port));
-        else
-                maybebadio(port);
-        return 0;
-}
-
-u32 titan_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return __raw_readl(port);
-        else if (port >= 0x2000)
-                return __raw_readw(port2adr(port));
-        else
-                maybebadio(port);
-        return 0;
-}
-
-void titan_outb(u8 value, unsigned long port)
-{
-        if (PXSEG(port))
-                __raw_writeb(value, port);
-        else
-                __raw_writew(value, port2adr(port));
-}
-
-void titan_outb_p(u8 value, unsigned long port)
-{
-        if (PXSEG(port))
-                __raw_writeb(value, port);
-        else
-                __raw_writew(value, port2adr(port));
-        ctrl_delay();
-}
-
-void titan_outw(u16 value, unsigned long port)
-{
-        if (PXSEG(port))
-                __raw_writew(value, port);
-        else if (port >= 0x2000)
-                __raw_writew(value, port2adr(port));
-        else
-                maybebadio(port);
-}
-
-void titan_outl(u32 value, unsigned long port)
-{
-        if (PXSEG(port))
-                __raw_writel(value, port);
-        else
-                maybebadio(port);
-}
-
-void titan_insl(unsigned long port, void *dst, unsigned long count)
-{
-        maybebadio(port);
-}
-
-void titan_outsl(unsigned long port, const void *src, unsigned long count)
-{
-        maybebadio(port);
-}
-
-void __iomem *titan_ioport_map(unsigned long port, unsigned int size)
-{
-        if (PXSEG(port))
-                return (void __iomem *)port;
-
-        return (void __iomem *)port2adr(port);
-}