7 files changed, 4 insertions, 75 deletions

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index d5d7a16cbfe0..b66139ff73fc 100644
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -29,7 +29,7 @@ static void __init check_bugs(void)
                 *p++ = '2';
                 *p++ = 'a';
                 break;
-        case CPU_SH7705 ... CPU_SH7300:
+        case CPU_SH7705 ... CPU_SH7729:
                 *p++ = '3';
                 break;
         case CPU_SH7750 ... CPU_SH4_501:
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h
index 273f3229785c..0a054b53b9de 100644
--- a/include/asm-sh/cpu-sh3/freq.h
+++ b/include/asm-sh/cpu-sh3/freq.h
@@ -10,11 +10,7 @@
 #ifndef __ASM_CPU_SH3_FREQ_H
 #define __ASM_CPU_SH3_FREQ_H
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300)
-#define FRQCR                   0xa415ff80
-#else
 #define FRQCR                   0xffffff80
-#endif
 #define MIN_DIVISOR_NR          0
 #define MAX_DIVISOR_NR          4
 
diff --git a/include/asm-sh/cpu-sh3/mmu_context.h b/include/asm-sh/cpu-sh3/mmu_context.h
index 4704e86dff5b..b20786d42d09 100644
--- a/include/asm-sh/cpu-sh3/mmu_context.h
+++ b/include/asm-sh/cpu-sh3/mmu_context.h
@@ -30,7 +30,6 @@
 #if defined(CONFIG_CPU_SUBTYPE_SH7707) || \
     defined(CONFIG_CPU_SUBTYPE_SH7709) || \
     defined(CONFIG_CPU_SUBTYPE_SH7706) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300) || \
     defined(CONFIG_CPU_SUBTYPE_SH7705) || \
     defined(CONFIG_CPU_SUBTYPE_SH7712) || \
     defined(CONFIG_CPU_SUBTYPE_SH7710)
diff --git a/include/asm-sh/cpu-sh3/timer.h b/include/asm-sh/cpu-sh3/timer.h
index 4928b08f9d19..b6c2020a2ad3 100644
--- a/include/asm-sh/cpu-sh3/timer.h
+++ b/include/asm-sh/cpu-sh3/timer.h
@@ -19,7 +19,6 @@
  *      SH7729R
  *      SH7710
  *      SH7720
- *      SH7300
  *      SH7710
  * ---------------------------------------------------------------------------
  */
@@ -28,7 +27,7 @@
 #define TMU_TOCR        0xfffffe90      /* Byte access */
 #endif
 
-#if defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7710)
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
 #define TMU_012_TSTR    0xa412fe92      /* Byte access */
 
 #define TMU0_TCOR       0xa412fe94      /* Long access */
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h
index 7969d3a127da..26d52174f4b4 100644
--- a/include/asm-sh/processor.h
+++ b/include/asm-sh/processor.h
@@ -45,7 +45,7 @@ enum cpu_type {
         CPU_SH7705, CPU_SH7706, CPU_SH7707,
         CPU_SH7708, CPU_SH7708S, CPU_SH7708R,
         CPU_SH7709, CPU_SH7709A, CPU_SH7710, CPU_SH7712,
-        CPU_SH7729, CPU_SH7300,
+        CPU_SH7729,
 
         /* SH-4 types */
         CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R,
diff --git a/include/asm-sh/se7300.h b/include/asm-sh/se7300.h
deleted file mode 100644
index 4e24edccb30d..000000000000
--- a/include/asm-sh/se7300.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef __ASM_SH_HITACHI_SE7300_H
-#define __ASM_SH_HITACHI_SE7300_H
-
-/*
- * linux/include/asm-sh/se/se7300.h
- *
- * Copyright (C) 2003 Takashi Kusuda <kusuda-takashi@hitachi-ul.co.jp>
- *
- * SH-Mobile SolutionEngine 7300 support
- */
-
-/* Box specific addresses.  */
-
-/* Area 0 */
-#define PA_ROM          0x00000000      /* EPROM */
-#define PA_ROM_SIZE     0x00400000      /* EPROM size 4M byte(Actually 2MB) */
-#define PA_FROM         0x00400000      /* Flash ROM */
-#define PA_FROM_SIZE    0x00400000      /* Flash size 4M byte */
-#define PA_SRAM         0x00800000      /* SRAM */
-#define PA_FROM_SIZE    0x00400000      /* SRAM size 4M byte */
-/* Area 1 */
-#define PA_EXT1         0x04000000
-#define PA_EXT1_SIZE    0x04000000
-/* Area 2 */
-#define PA_EXT2         0x08000000
-#define PA_EXT2_SIZE    0x04000000
-/* Area 3 */
-#define PA_SDRAM        0x0c000000
-#define PA_SDRAM_SIZE   0x04000000
-/* Area 4 */
-#define PA_PCIC         0x10000000      /* MR-SHPC-01 PCMCIA */
-#define PA_MRSHPC       0xb03fffe0      /* MR-SHPC-01 PCMCIA controller */
-#define PA_MRSHPC_MW1   0xb0400000      /* MR-SHPC-01 memory window base */
-#define PA_MRSHPC_MW2   0xb0500000      /* MR-SHPC-01 attribute window base */
-#define PA_MRSHPC_IO    0xb0600000      /* MR-SHPC-01 I/O window base */
-#define MRSHPC_OPTION   (PA_MRSHPC + 6)
-#define MRSHPC_CSR      (PA_MRSHPC + 8)
-#define MRSHPC_ISR      (PA_MRSHPC + 10)
-#define MRSHPC_ICR      (PA_MRSHPC + 12)
-#define MRSHPC_CPWCR    (PA_MRSHPC + 14)
-#define MRSHPC_MW0CR1   (PA_MRSHPC + 16)
-#define MRSHPC_MW1CR1   (PA_MRSHPC + 18)
-#define MRSHPC_IOWCR1   (PA_MRSHPC + 20)
-#define MRSHPC_MW0CR2   (PA_MRSHPC + 22)
-#define MRSHPC_MW1CR2   (PA_MRSHPC + 24)
-#define MRSHPC_IOWCR2   (PA_MRSHPC + 26)
-#define MRSHPC_CDCR     (PA_MRSHPC + 28)
-#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
-#define PA_LED          0xb0800000      /* LED */
-#define PA_DIPSW        0xb0900000      /* Dip switch 31 */
-#define PA_EPLD_MODESET 0xb0a00000      /* FPGA Mode set register */
-#define PA_EPLD_ST1     0xb0a80000      /* FPGA Interrupt status register1 */
-#define PA_EPLD_ST2     0xb0ac0000      /* FPGA Interrupt status register2 */
-/* Area 5 */
-#define PA_EXT5         0x14000000
-#define PA_EXT5_SIZE    0x04000000
-/* Area 6 */
-#define PA_LCD1         0xb8000000
-#define PA_LCD2         0xb8800000
-
-#define __IO_PREFIX     sh7300se
-#include <asm/io_generic.h>
-
-#endif  /* __ASM_SH_HITACHI_SE7300_H */
diff --git a/include/asm-sh/ubc.h b/include/asm-sh/ubc.h
index 38d46e01b846..56f4e30dc49c 100644
--- a/include/asm-sh/ubc.h
+++ b/include/asm-sh/ubc.h
@@ -15,8 +15,7 @@
 #include <asm/cpu/ubc.h>
 
 /* User Break Controller */
-#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7300)
+#if defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709)
 #define UBC_TYPE_SH7729 (current_cpu_data.type == CPU_SH7729)
 #else
 #define UBC_TYPE_SH7729 0