aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Menefy <stuart.menefy@st.com>2008-07-02 02:15:09 -0400
committerPaul Mundt <lethal@linux-sh.org>2008-07-28 05:10:32 -0400
commit3611ee7acc113e5e482b7d20d5133935226f3129 (patch)
tree514eb8f7e4901f784f24d74eecfc971409da410a
parentef9247ef89be79ffbd9faaf722e05b7bed14fc1e (diff)
sh: Stub in silicon cut in CPU info.
Signed-off-by: Stuart Menefy <stuart.menefy@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/cpu/sh4/probe.c3
-rw-r--r--arch/sh/kernel/setup.c6
-rw-r--r--include/asm-sh/processor_32.h1
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index be4926969181..db442f37852d 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -64,6 +64,9 @@ int __init detect_cpu_and_cache_system(void)
64 if ((cvr & 0x20000000) == 1) 64 if ((cvr & 0x20000000) == 1)
65 boot_cpu_data.flags |= CPU_HAS_FPU; 65 boot_cpu_data.flags |= CPU_HAS_FPU;
66 66
67 /* We don't know the chip cut */
68 boot_cpu_data.cut_major = boot_cpu_data.cut_minor = -1;
69
67 /* Mask off the upper chip ID */ 70 /* Mask off the upper chip ID */
68 pvr &= 0xffff; 71 pvr &= 0xffff;
69 72
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 9324cb91fd35..6339d0c95715 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -453,6 +453,12 @@ static int show_cpuinfo(struct seq_file *m, void *v)
453 seq_printf(m, "processor\t: %d\n", cpu); 453 seq_printf(m, "processor\t: %d\n", cpu);
454 seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine); 454 seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
455 seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c)); 455 seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c));
456 if (c->cut_major == -1)
457 seq_printf(m, "cut\t\t: unknown\n");
458 else if (c->cut_minor == -1)
459 seq_printf(m, "cut\t\t: %d.x\n", c->cut_major);
460 else
461 seq_printf(m, "cut\t\t: %d.%d\n", c->cut_major, c->cut_minor);
456 462
457 show_cpuflags(m, c); 463 show_cpuflags(m, c);
458 464
diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h
index 81628f144faf..c6583f267071 100644
--- a/include/asm-sh/processor_32.h
+++ b/include/asm-sh/processor_32.h
@@ -28,6 +28,7 @@
28 28
29struct sh_cpuinfo { 29struct sh_cpuinfo {
30 unsigned int type; 30 unsigned int type;
31 int cut_major, cut_minor;
31 unsigned long loops_per_jiffy; 32 unsigned long loops_per_jiffy;
32 unsigned long asid_cache; 33 unsigned long asid_cache;
33 34