[PATCH] sh: Cleanup struct sh_cpuinfo for clock framework changes

Now that the clock framework changes have been integrated, the manual clock
accounting that was done in sh_cpuinfo can be dropped.

Also correct a bug with running past the end of the CPU flags when there's a
mismatch between the added flags and printed ones.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 15 insertions, 23 deletions

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 036050b377cd..0f1fbe72cce4 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -22,10 +22,10 @@
 #include <linux/cpu.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/io_generic.h>
 #include <asm/sections.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
+#include <asm/clock.h>
 
 #ifdef CONFIG_SH_KGDB
 #include <asm/kgdb.h>
@@ -41,7 +41,7 @@ extern void * __rd_start, * __rd_end;
  * This value will be used at the very early stage of serial setup.
  * The bigger value means no problem.
  */
-struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 0, 10000000, };
+struct sh_cpuinfo boot_cpu_data = { CPU_SH_NONE, 10000000, };
 struct screen_info screen_info;
 
 #if defined(CONFIG_SH_UNKNOWN)
@@ -273,10 +273,10 @@ void __init setup_arch(char **cmdline_p)
         init_mm.end_data = (unsigned long) _edata;
         init_mm.brk = (unsigned long) _end;
 
-        code_resource.start = virt_to_bus(_text);
-        code_resource.end = virt_to_bus(_etext)-1;
-        data_resource.start = virt_to_bus(_etext);
-        data_resource.end = virt_to_bus(_edata)-1;
+        code_resource.start = (unsigned long)virt_to_phys(_text);
+        code_resource.end = (unsigned long)virt_to_phys(_etext)-1;
+        data_resource.start = (unsigned long)virt_to_phys(_etext);
+        data_resource.end = (unsigned long)virt_to_phys(_edata)-1;
 
         sh_mv_setup(cmdline_p);
 
@@ -435,6 +435,9 @@ static const char *cpu_name[] = {
         [CPU_ST40GX1]   = "ST40GX1",
         [CPU_SH4_202]   = "SH4-202",
         [CPU_SH4_501]   = "SH4-501",
+        [CPU_SH7770]    = "SH7770",
+        [CPU_SH7780]    = "SH7780",
+        [CPU_SH7781]    = "SH7781",
         [CPU_SH_NONE]   = "Unknown"
 };
 
@@ -445,7 +448,7 @@ const char *get_cpu_subtype(void)
 
 #ifdef CONFIG_PROC_FS
 static const char *cpu_flags[] = {
-        "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr",
+        "none", "fpu", "p2flush", "mmuassoc", "dsp", "perfctr", "ptea", NULL
 };
 
 static void show_cpuflags(struct seq_file *m)
@@ -459,7 +462,7 @@ static void show_cpuflags(struct seq_file *m)
                 return;
         }
 
-        for (i = 0; i < cpu_data->flags; i++)
+        for (i = 0; cpu_flags[i]; i++)
                 if ((cpu_data->flags & (1 << i)))
                         seq_printf(m, " %s", cpu_flags[i+1]);
 
@@ -472,7 +475,8 @@ static void show_cacheinfo(struct seq_file *m, const char *type, struct cache_in
 
         cache_size = info.ways * info.sets * info.linesz;
 
-        seq_printf(m, "%s size\t: %dKiB\n", type, cache_size >> 10);
+        seq_printf(m, "%s size\t: %2dKiB (%d-way)\n",
+                   type, cache_size >> 10, info.ways);
 }
 
 /*
@@ -511,21 +515,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                      boot_cpu_data.loops_per_jiffy/(500000/HZ),
                      (boot_cpu_data.loops_per_jiffy/(5000/HZ)) % 100);
 
-#define PRINT_CLOCK(name, value) \
-        seq_printf(m, name " clock\t: %d.%02dMHz\n", \
-                     ((value) / 1000000), ((value) % 1000000)/10000)
-        
-        PRINT_CLOCK("cpu", boot_cpu_data.cpu_clock);
-        PRINT_CLOCK("bus", boot_cpu_data.bus_clock);
-#ifdef CONFIG_CPU_SUBTYPE_ST40STB1
-        PRINT_CLOCK("memory", boot_cpu_data.memory_clock);
-#endif
-        PRINT_CLOCK("module", boot_cpu_data.module_clock);
-
-        return 0;
+        return show_clocks(m);
 }
 
-
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
         return *pos < NR_CPUS ? cpu_data + *pos : NULL;
@@ -596,7 +588,7 @@ static int __init kgdb_parse_options(char *options)
                 options += map->namelen + 1;
 
                 options = (*options == ',') ? options+1 : options;
-                
+
                 /* Read optional parameters (baud/parity/bits) */
                 baud = simple_strtoul(options, &options, 10);
                 if (baud != 0) {