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>

diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index be4926969181299d26339c5dcefd84be2ae41f46..db442f37852dc4cb09d99aa68414c83b02e80633 100644 (file)
--- 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)
        if ((cvr & 0x20000000) == 1)
                boot_cpu_data.flags |= CPU_HAS_FPU;
 
+       /* We don't know the chip cut */
+       boot_cpu_data.cut_major = boot_cpu_data.cut_minor = -1;
+
        /* Mask off the upper chip ID */
        pvr &= 0xffff;
 

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 9324cb91fd35d0d5b525cebe3efe6399d37ccaec..6339d0c9571557c481613bc7d06f7adee9fa6140 100644 (file)
--- 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)
        seq_printf(m, "processor\t: %d\n", cpu);
        seq_printf(m, "cpu family\t: %s\n", init_utsname()->machine);
        seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype(c));
+       if (c->cut_major == -1)
+               seq_printf(m, "cut\t\t: unknown\n");
+       else if (c->cut_minor == -1)
+               seq_printf(m, "cut\t\t: %d.x\n", c->cut_major);
+       else
+               seq_printf(m, "cut\t\t: %d.%d\n", c->cut_major, c->cut_minor);
 
        show_cpuflags(m, c);
 

diff --git a/include/asm-sh/processor_32.h b/include/asm-sh/processor_32.h
index 81628f144fafacfd5eb726e7d0c3db05838fc0f5..c6583f2670715fc3e12f396bc2b17c1d4100c508 100644 (file)
--- a/include/asm-sh/processor_32.h
+++ b/include/asm-sh/processor_32.h
@@ -28,6 +28,7 @@
 
 struct sh_cpuinfo {
        unsigned int type;
+       int cut_major, cut_minor;
        unsigned long loops_per_jiffy;
        unsigned long asid_cache;