sh: Add support for SH7706/SH7710/SH7343 CPUs.

This adds support for the aforementioned CPU subtypes, and cleans
up some build issues encountered as a result.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

5 files changed, 188 insertions, 4 deletions

diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 1b292ae16f..58d3815695 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 0000000000..0cf96f9833
--- /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 cc04e9e239..44daf44833 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 5cdc886386..e670988362 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 0000000000..895f99ee6a
--- /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);