4 files changed, 3 insertions, 72 deletions

diff --git a/include/asm-sh/cpu-sh2/cache.h b/include/asm-sh/cpu-sh2/cache.h
index 20b9796842dc..f02ba7a672b2 100644
--- a/include/asm-sh/cpu-sh2/cache.h
+++ b/include/asm-sh/cpu-sh2/cache.h
@@ -12,23 +12,7 @@
 
 #define L1_CACHE_SHIFT  4
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7604)
-#define CCR             0xfffffe92      /* Address of Cache Control Register */
-
-#define CCR_CACHE_CE    0x01    /* Cache enable */
-#define CCR_CACHE_ID    0x02    /* Instruction Replacement disable */
-#define CCR_CACHE_OD    0x04    /* Data Replacement disable */
-#define CCR_CACHE_TW    0x08    /* Two-way mode */
-#define CCR_CACHE_CP    0x10    /* Cache purge */
-
-#define CACHE_OC_ADDRESS_ARRAY  0x60000000
-
-#define CCR_CACHE_ENABLE        CCR_CACHE_CE
-#define CCR_CACHE_INVALIDATE    CCR_CACHE_CP
-#define CCR_CACHE_ORA           CCR_CACHE_TW
-#define CCR_CACHE_WT            0x00    /* SH-2 is _always_ write-through */
-
-#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+#if defined(CONFIG_CPU_SUBTYPE_SH7619)
 #define CCR1            0xffffffec
 #define CCR             CCR1
 
@@ -49,5 +33,5 @@
 #define CCR_CACHE_ENABLE        CCR_CACHE_CE
 #define CCR_CACHE_INVALIDATE    CCR_CACHE_CF
 #endif
-#endif /* __ASM_CPU_SH2_CACHE_H */
 
+#endif /* __ASM_CPU_SH2_CACHE_H */
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index d42f68e724fa..1fc5eed1b22a 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -36,7 +36,7 @@
  */
 enum cpu_type {
         /* SH-2 types */
-        CPU_SH7604, CPU_SH7619,
+        CPU_SH7619,
 
         /* SH-2A types */
         CPU_SH7206,
diff --git a/include/asm-sh/saturn/io.h b/include/asm-sh/saturn/io.h
deleted file mode 100644
index f1b9b5d633f4..000000000000
--- a/include/asm-sh/saturn/io.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * include/asm-sh/saturn/io.h
- *
- * I/O functions for use on the Sega Saturn.
- *
- * Copyright (C) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#ifndef __ASM_SH_SATURN_IO_H
-#define __ASM_SH_SATURN_IO_H
-
-/* arch/sh/boards/saturn/io.c */
-extern unsigned long saturn_isa_port2addr(unsigned long offset);
-extern void *saturn_ioremap(unsigned long offset, unsigned long size);
-extern void saturn_iounmap(void *addr);
-
-#endif /* __ASM_SH_SATURN_IO_H */
-
diff --git a/include/asm-sh/saturn/smpc.h b/include/asm-sh/saturn/smpc.h
deleted file mode 100644
index 5de5c12d6347..000000000000
--- a/include/asm-sh/saturn/smpc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * include/asm-sh/saturn/smpc.h
- *
- * System Manager / Peripheral Control definitions.
- *
- * Copyright (C) 2002 Paul Mundt
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#ifndef __ASM_SH_SATURN_SMPC_H
-#define __ASM_SH_SATURN_SMPC_H
-
-#include <asm/io.h>
-
-#define SMPC_COMMAND    0x2010001f      /* SMPC command register */
-#define SMPC_RESULT     0x2010005f      /* SMPC result register */
-#define SMPC_STATUS     0x20100063      /* SMPC status register */
-
-#define SMPC_CMD_MSHON  0x0001          /* Master SH On */
-#define SMPC_CMD_SSHON  0x0002          /* Slave SH On */
-#define SMPC_CMD_SSHOFF 0x0003          /* Slave SH Off */
-#define SMPC_CMD_SNDON  0x0004          /* Sound On */
-#define SMPC_CMD_SNDOFF 0x0005          /* Sound Off */
-#define SMPC_CMD_CDON   0x0006          /* CD On */
-#define SMPC_CMD_CDOFF  0x0007          /* CD Off */
-
-static inline void smpc_barrier(void)
-{
-        while ((ctrl_inb(SMPC_STATUS) & 0x0001) == 0x0001)
-                ;
-}
-
-#endif /* __ASM_SH_SATURN_SMPC_H */
-