diff options
author | Robin Getz <robin.getz@analog.com> | 2009-06-08 13:52:27 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-13 07:20:07 -0400 |
commit | 2466ac65560ee8b7506eea3987aba9519355fd02 (patch) | |
tree | 09a3c3a4b3bc19a35b9fa30e29e9add105f25430 | |
parent | 70f12567ac9aca9c2f242ae060d7de245904889e (diff) |
Blackfin: include the cpu compiled version in /proc/cpuinfo
Since the compiled-for cpu revision can be significant, include it in the
cpuinfo output along side the cpu revision we're currently running on.
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | arch/blackfin/kernel/setup.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 80447f99c2b5..f5f516e817f4 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -1098,7 +1098,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
1098 | CPUID, bfin_cpuid()); | 1098 | CPUID, bfin_cpuid()); |
1099 | 1099 | ||
1100 | seq_printf(m, "model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n" | 1100 | seq_printf(m, "model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n" |
1101 | "stepping\t: %d\n", | 1101 | "stepping\t: %d ", |
1102 | cpu, cclk/1000000, sclk/1000000, | 1102 | cpu, cclk/1000000, sclk/1000000, |
1103 | #ifdef CONFIG_MPU | 1103 | #ifdef CONFIG_MPU |
1104 | "mpu on", | 1104 | "mpu on", |
@@ -1107,7 +1107,16 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
1107 | #endif | 1107 | #endif |
1108 | revid); | 1108 | revid); |
1109 | 1109 | ||
1110 | seq_printf(m, "cpu MHz\t\t: %lu.%03lu/%lu.%03lu\n", | 1110 | if (bfin_revid() != bfin_compiled_revid()) { |
1111 | if (bfin_compiled_revid() == -1) | ||
1112 | seq_printf(m, "(Compiled for Rev none)"); | ||
1113 | else if (bfin_compiled_revid() == 0xffff) | ||
1114 | seq_printf(m, "(Compiled for Rev any)"); | ||
1115 | else | ||
1116 | seq_printf(m, "(Compiled for Rev %d)", bfin_compiled_revid()); | ||
1117 | } | ||
1118 | |||
1119 | seq_printf(m, "\ncpu MHz\t\t: %lu.%03lu/%lu.%03lu\n", | ||
1111 | cclk/1000000, cclk%1000000, | 1120 | cclk/1000000, cclk%1000000, |
1112 | sclk/1000000, sclk%1000000); | 1121 | sclk/1000000, sclk%1000000); |
1113 | seq_printf(m, "bogomips\t: %lu.%02lu\n" | 1122 | seq_printf(m, "bogomips\t: %lu.%02lu\n" |