13 files changed, 267 insertions, 36 deletions

diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index 0f545941fb4f..d2b715a04c7e 100644
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -89,6 +89,7 @@ static void mask_and_ack_ipr(unsigned int irq)
         disable_ipr_irq(irq);
 
 #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)
         /* This is needed when we use edge triggered setting */
         /* XXX: Is it really needed? */
@@ -162,6 +163,7 @@ void __init init_IRQ(void)
 #endif
 
 #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)
         /*
          * Initialize the Interrupt Controller (INTC)
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 1b292ae16f07..58d3815695ff 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -6,16 +6,19 @@ obj-y	:= ex.o probe.o
 
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7705)        += setup-sh7705.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7706)        += setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7707)        += setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7708)        += setup-sh7708.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7709)        += setup-sh7709.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7300)        += setup-sh7300.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7710)        += setup-sh7710.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                 := clock-sh3.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7300)      := clock-sh7300.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7705)      := clock-sh7705.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7706)      := clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)      := clock-sh7709.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7710)      := clock-sh7300.o
 
 obj-y   += $(clock-y)
-
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7706.c b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
new file mode 100644
index 000000000000..0cf96f9833bc
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
@@ -0,0 +1,84 @@
+/*
+ * arch/sh/kernel/cpu/sh3/clock-sh7706.c
+ *
+ * SH7706 support for the clock framework
+ *
+ *  Copyright (C) 2006  Takashi YOSHII
+ *
+ * Based on arch/sh/kernel/cpu/sh3/clock-sh7709.c
+ *  Copyright (C) 2005  Andriy Skulysh
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <asm/clock.h>
+#include <asm/freq.h>
+#include <asm/io.h>
+
+static int stc_multipliers[] = { 1, 2, 4, 1, 3, 6, 1, 1 };
+static int ifc_divisors[]    = { 1, 2, 4, 1, 3, 1, 1, 1 };
+static int pfc_divisors[]    = { 1, 2, 4, 1, 3, 6, 1, 1 };
+
+static void master_clk_init(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
+
+        clk->rate *= pfc_divisors[idx];
+}
+
+static struct clk_ops sh7706_master_clk_ops = {
+        .init           = master_clk_init,
+};
+
+static void module_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
+
+        clk->rate = clk->parent->rate / pfc_divisors[idx];
+}
+
+static struct clk_ops sh7706_module_clk_ops = {
+        .recalc         = module_clk_recalc,
+};
+
+static void bus_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x8000) >> 13) | ((frqcr & 0x0030) >> 4);
+
+        clk->rate = clk->parent->rate / stc_multipliers[idx];
+}
+
+static struct clk_ops sh7706_bus_clk_ops = {
+        .recalc         = bus_clk_recalc,
+};
+
+static void cpu_clk_recalc(struct clk *clk)
+{
+        int frqcr = ctrl_inw(FRQCR);
+        int idx = ((frqcr & 0x4000) >> 12) | ((frqcr & 0x000c) >> 2);
+
+        clk->rate = clk->parent->rate / ifc_divisors[idx];
+}
+
+static struct clk_ops sh7706_cpu_clk_ops = {
+        .recalc         = cpu_clk_recalc,
+};
+
+static struct clk_ops *sh7706_clk_ops[] = {
+        &sh7706_master_clk_ops,
+        &sh7706_module_clk_ops,
+        &sh7706_bus_clk_ops,
+        &sh7706_cpu_clk_ops,
+};
+
+void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
+{
+        if (idx < ARRAY_SIZE(sh7706_clk_ops))
+                *ops = sh7706_clk_ops[idx];
+}
diff --git a/arch/sh/kernel/cpu/sh3/ex.S b/arch/sh/kernel/cpu/sh3/ex.S
index cc04e9e239ff..44daf44833f9 100644
--- a/arch/sh/kernel/cpu/sh3/ex.S
+++ b/arch/sh/kernel/cpu/sh3/ex.S
@@ -84,8 +84,12 @@ ENTRY(interrupt_table)
         .long   do_IRQ  !      rovi
         .long   do_IRQ                  
         .long   do_IRQ                  /* 5E0 */
-#if  defined(CONFIG_CPU_SUBTYPE_SH7707) || defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-     defined(CONFIG_CPU_SUBTYPE_SH7300) || defined(CONFIG_CPU_SUBTYPE_SH7705)
+#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_SH7710)
         .long   do_IRQ  ! 32 IRQ  irq0  /* 600 */
         .long   do_IRQ  ! 33      irq1
         .long   do_IRQ  ! 34      irq2
@@ -147,6 +151,51 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 62 PCC  pcc0i
         .long   do_IRQ  ! 63      pcc1i /* 9E0 */
 #endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+        .long   exception_none  ! 61    /* 9A0 */
+        .long   exception_none  ! 62
+        .long   exception_none  ! 63
+        .long   exception_none  ! 64    /* A00 */
+        .long   exception_none  ! 65
+        .long   exception_none  ! 66
+        .long   exception_none  ! 67
+        .long   exception_none  ! 68
+        .long   exception_none  ! 69
+        .long   exception_none  ! 70
+        .long   exception_none  ! 71
+        .long   exception_none  ! 72    /* B00 */
+        .long   exception_none  ! 73
+        .long   exception_none  ! 74
+        .long   exception_none  ! 75
+        .long   do_IRQ  ! 76 DMAC2 dei4 /* B80 */
+        .long   do_IRQ  ! 77 DMAC2 dei5
+        .long   exception_none  ! 78
+        .long   do_IRQ  ! 79 IPSEC ipseci /* BE0 */
+        .long   do_IRQ  ! 80 EDMAC eint0 /* C00 */
+        .long   do_IRQ  ! 81 EDMAC eint1
+        .long   do_IRQ  ! 82 EDMAC eint2
+        .long   exception_none  ! 83    /* C60 */
+        .long   exception_none  ! 84
+        .long   exception_none  ! 85
+        .long   exception_none  ! 86
+        .long   exception_none  ! 87
+        .long   exception_none  ! 88    /* D00 */
+        .long   exception_none  ! 89
+        .long   exception_none  ! 90
+        .long   exception_none  ! 91
+        .long   exception_none  ! 92
+        .long   exception_none  ! 93
+        .long   exception_none  ! 94
+        .long   exception_none  ! 95
+        .long   do_IRQ  ! 96 SIOF eri0  /* E00 */
+        .long   do_IRQ  ! 97      txi0
+        .long   do_IRQ  ! 98      rxi0
+        .long   do_IRQ  ! 99      cci0
+        .long   do_IRQ  ! 100     eri1  /* E80 */
+        .long   do_IRQ  ! 101     txi1
+        .long   do_IRQ  ! 102     rxi2
+        .long   do_IRQ  ! 103     cci3
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7300)
         .long   do_IRQ  ! 64
         .long   do_IRQ  ! 65
@@ -195,4 +244,3 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 108
 #endif
 #endif
-
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index 5cdc88638601..e67098836290 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -72,6 +72,12 @@ int __init detect_cpu_and_cache_system(void)
                 cpu_data->dcache.sets           = 256;
                 cpu_data->type = CPU_SH7729;
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7706)
+                cpu_data->type = CPU_SH7706;
+#endif
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+                cpu_data->type = CPU_SH7710;
+#endif
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
                 cpu_data->type = CPU_SH7705;
 
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
new file mode 100644
index 000000000000..895f99ee6a95
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -0,0 +1,43 @@
+/*
+ * SH7710 Setup
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xa4400000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 52, 53, 55, 54 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7710_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7710_devices_setup(void)
+{
+        return platform_add_devices(sh7710_devices,
+                                    ARRAY_SIZE(sh7710_devices));
+}
+__initcall(sh7710_devices_setup);
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 48946d54a2cd..8dbf3895ece7 100644
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7760)	+= setup-sh7760.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7770)        += setup-sh7770.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7780)        += setup-sh7780.o
 obj-$(CONFIG_CPU_SUBTYPE_SH73180)       += setup-sh73180.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7343)        += setup-sh7343.o
 obj-$(CONFIG_CPU_SUBTYPE_SH4_202)       += setup-sh4-202.o
 
 # Primary on-chip clocks (common)
diff --git a/arch/sh/kernel/cpu/sh4/ex.S b/arch/sh/kernel/cpu/sh4/ex.S
index af5ecbddea55..7146893a6cca 100644
--- a/arch/sh/kernel/cpu/sh4/ex.S
+++ b/arch/sh/kernel/cpu/sh4/ex.S
@@ -123,6 +123,13 @@ ENTRY(interrupt_table)
         .long   do_IRQ  ! 45      dmte5
         .long   do_IRQ  ! 46      dmte6
         .long   do_IRQ  ! 47      dmte7         /* 7E0 */
+#elif defined(CONFIG_CPU_SUBTYPE_SH7343)
+        .long   do_IRQ  ! 44 IIC1 ali           /* 780 */
+        .long   do_IRQ  ! 45      tacki
+        .long   do_IRQ  ! 46      waiti
+        .long   do_IRQ  ! 47      dtei          /* 7E0 */
+        .long   do_IRQ  ! 48 DMAC dei0          /* 800 */
+        .long   do_IRQ  ! 49      dei1          /* 820 */
 #else
         .long   exception_error                 ! 44    /* 780 */
         .long   exception_error                 ! 45
@@ -132,7 +139,8 @@ ENTRY(interrupt_table)
 #if defined(CONFIG_SH_FPU)
         .long   do_fpu_state_restore    ! 48    /* 800 */
         .long   do_fpu_state_restore    ! 49    /* 820 */
-#else
+#elif !defined(CONFIG_CPU_SUBTYPE_SH7343) && \
+      !defined(CONFIG_CPU_SUBTYPE_SH73180)
         .long   exception_error
         .long   exception_error
 #endif
@@ -225,7 +233,7 @@ ENTRY(interrupt_table)
         .long   exception_error
         .long   do_IRQ  ! ADC   adi
         .long   do_IRQ  ! CMT   cmti    /* FA0 */
-#elif defined(CONFIG_CPU_SUBTYPE_SH73180)
+#elif defined(CONFIG_CPU_SUBTYPE_SH73180) || defined(CONFIG_CPU_SUBTYPE_SH7343)
         .long   do_IRQ  !  50 0x840
         .long   do_IRQ  !  51 0x860
         .long   do_IRQ  !  52 0x880
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 2a7707a81d8f..6e8a2b5268e8 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -3,7 +3,7 @@
  *
  * CPU Subtype Probing for SH-4.
  *
- * Copyright (C) 2001 - 2005  Paul Mundt
+ * Copyright (C) 2001 - 2006  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -76,12 +76,6 @@ int __init detect_cpu_and_cache_system(void)
                 cpu_data->type = CPU_SH73180;
                 cpu_data->icache.ways = 4;
                 cpu_data->dcache.ways = 4;
-
-                /*
-                 * XXX: Double check this, none of the SH-4A/SH-4AL processors
-                 * should have this, as it's essentially a legacy thing.
-                 */
-                cpu_data->flags |= CPU_HAS_PTEA;
                 break;
         case 0x2001:
         case 0x2004:
@@ -89,8 +83,7 @@ int __init detect_cpu_and_cache_system(void)
                 cpu_data->icache.ways = 4;
                 cpu_data->dcache.ways = 4;
 
-                /* Same note as above applies here for PTEA */
-                cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
+                cpu_data->flags |= CPU_HAS_FPU;
                 break;
         case 0x2006:
         case 0x200A:
@@ -104,6 +97,12 @@ int __init detect_cpu_and_cache_system(void)
 
                 cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER;
                 break;
+        case 0x3000:
+        case 0x3003:
+                cpu_data->type = CPU_SH7343;
+                cpu_data->icache.ways = 4;
+                cpu_data->dcache.ways = 4;
+                break;
         case 0x8000:
                 cpu_data->type = CPU_ST40RA;
                 cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA;
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7343.c b/arch/sh/kernel/cpu/sh4/setup-sh7343.c
new file mode 100644
index 000000000000..91d61cf91ba1
--- /dev/null
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7343.c
@@ -0,0 +1,43 @@
+/*
+ * SH7343 Setup
+ *
+ *  Copyright (C) 2006  Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <asm/sci.h>
+
+static struct plat_sci_port sci_platform_data[] = {
+        {
+                .mapbase        = 0xffe00000,
+                .flags          = UPF_BOOT_AUTOCONF,
+                .type           = PORT_SCIF,
+                .irqs           = { 80, 81, 83, 82 },
+        }, {
+                .flags = 0,
+        }
+};
+
+static struct platform_device sci_device = {
+        .name           = "sh-sci",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = sci_platform_data,
+        },
+};
+
+static struct platform_device *sh7343_devices[] __initdata = {
+        &sci_device,
+};
+
+static int __init sh7343_devices_setup(void)
+{
+        return platform_add_devices(sh7343_devices,
+                                    ARRAY_SIZE(sh7343_devices));
+}
+__initcall(sh7343_devices_setup);
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index c4aa687ba26a..2167746e88f1 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -310,7 +310,7 @@ ubc_set_tracing(int asid, unsigned long pc)
 
         ctrl_outl(0, UBC_BAMRA);
 
-        if (cpu_data->type == CPU_SH7729) {
+        if (cpu_data->type == CPU_SH7729 || cpu_data->type == CPU_SH7710) {
                 ctrl_outw(BBR_INST | BBR_READ | BBR_CPU, UBC_BBRA);
                 ctrl_outl(BRCR_PCBA | BRCR_PCTE, UBC_BRCR);
         } else {
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 4afdec071700..86ef17fe48b5 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -424,25 +424,18 @@ static int __init topology_init(void)
 subsys_initcall(topology_init);
 
 static const char *cpu_name[] = {
-        [CPU_SH7604]    = "SH7604",
-        [CPU_SH7705]    = "SH7705",
-        [CPU_SH7708]    = "SH7708",
-        [CPU_SH7729]    = "SH7729",
-        [CPU_SH7300]    = "SH7300",
-        [CPU_SH7750]    = "SH7750",
-        [CPU_SH7750S]   = "SH7750S",
-        [CPU_SH7750R]   = "SH7750R",
-        [CPU_SH7751]    = "SH7751",
-        [CPU_SH7751R]   = "SH7751R",
-        [CPU_SH7760]    = "SH7760",
-        [CPU_SH73180]   = "SH73180",
-        [CPU_ST40RA]    = "ST40RA",
-        [CPU_ST40GX1]   = "ST40GX1",
-        [CPU_SH4_202]   = "SH4-202",
-        [CPU_SH4_501]   = "SH4-501",
-        [CPU_SH7770]    = "SH7770",
-        [CPU_SH7780]    = "SH7780",
-        [CPU_SH7781]    = "SH7781",
+        [CPU_SH7604]    = "SH7604",     [CPU_SH7300]    = "SH7300",
+        [CPU_SH7705]    = "SH7705",     [CPU_SH7706]    = "SH7706",
+        [CPU_SH7707]    = "SH7707",     [CPU_SH7708]    = "SH7708",
+        [CPU_SH7709]    = "SH7709",     [CPU_SH7710]    = "SH7710",
+        [CPU_SH7729]    = "SH7729",     [CPU_SH7750]    = "SH7750",
+        [CPU_SH7750S]   = "SH7750S",    [CPU_SH7750R]   = "SH7750R",
+        [CPU_SH7751]    = "SH7751",     [CPU_SH7751R]   = "SH7751R",
+        [CPU_SH7760]    = "SH7760",     [CPU_SH73180]   = "SH73180",
+        [CPU_ST40RA]    = "ST40RA",     [CPU_ST40GX1]   = "ST40GX1",
+        [CPU_SH4_202]   = "SH4-202",    [CPU_SH4_501]   = "SH4-501",
+        [CPU_SH7770]    = "SH7770",     [CPU_SH7780]    = "SH7780",
+        [CPU_SH7781]    = "SH7781",     [CPU_SH7343]    = "SH7343",
         [CPU_SH_NONE]   = "Unknown"
 };
 
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index bf59d73415d7..d3cbfa2ad4a7 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -89,7 +89,8 @@ EXPORT_SYMBOL(flush_dcache_page);
 EXPORT_SYMBOL(__flush_purge_region);
 #endif
 
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \
+        defined(CONFIG_SH7705_CACHE_32KB))
 EXPORT_SYMBOL(clear_user_page);
 #endif