aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/setup_mm.c
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-13 21:39:04 -0400
committerGreg Ungerer <gerg@uclinux.org>2011-12-29 19:20:17 -0500
commit060632adc1973452745512a2897bae126f7eaae4 (patch)
treedfb551c989a2bdb4e418f7d974b512f11ee62496 /arch/m68k/kernel/setup_mm.c
parent59dbb3b168465e48e3a72b635ee0c184fa5c55aa (diff)
m68k: show ColdFire CPU/FPU/MMU type
Update the show_cpuinfo() code to display info about ColdFire cores. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Matt Waddel <mwaddel@yahoo.com> Acked-by: Kurt Mahan <kmahan@xmission.com>
Diffstat (limited to 'arch/m68k/kernel/setup_mm.c')
-rw-r--r--arch/m68k/kernel/setup_mm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 55f8f5049f6..52e17d1e613 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -388,6 +388,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
388#define LOOP_CYCLES_68030 (8) 388#define LOOP_CYCLES_68030 (8)
389#define LOOP_CYCLES_68040 (3) 389#define LOOP_CYCLES_68040 (3)
390#define LOOP_CYCLES_68060 (1) 390#define LOOP_CYCLES_68060 (1)
391#define LOOP_CYCLES_COLDFIRE (2)
391 392
392 if (CPU_IS_020) { 393 if (CPU_IS_020) {
393 cpu = "68020"; 394 cpu = "68020";
@@ -401,6 +402,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
401 } else if (CPU_IS_060) { 402 } else if (CPU_IS_060) {
402 cpu = "68060"; 403 cpu = "68060";
403 clockfactor = LOOP_CYCLES_68060; 404 clockfactor = LOOP_CYCLES_68060;
405 } else if (CPU_IS_COLDFIRE) {
406 cpu = "ColdFire";
407 clockfactor = LOOP_CYCLES_COLDFIRE;
404 } else { 408 } else {
405 cpu = "680x0"; 409 cpu = "680x0";
406 clockfactor = 0; 410 clockfactor = 0;
@@ -419,6 +423,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
419 fpu = "68060"; 423 fpu = "68060";
420 else if (m68k_fputype & FPU_SUNFPA) 424 else if (m68k_fputype & FPU_SUNFPA)
421 fpu = "Sun FPA"; 425 fpu = "Sun FPA";
426 else if (m68k_fputype & FPU_COLDFIRE)
427 fpu = "ColdFire";
422 else 428 else
423 fpu = "none"; 429 fpu = "none";
424#endif 430#endif
@@ -435,6 +441,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
435 mmu = "Sun-3"; 441 mmu = "Sun-3";
436 else if (m68k_mmutype & MMU_APOLLO) 442 else if (m68k_mmutype & MMU_APOLLO)
437 mmu = "Apollo"; 443 mmu = "Apollo";
444 else if (m68k_mmutype & MMU_COLDFIRE)
445 mmu = "ColdFire";
438 else 446 else
439 mmu = "unknown"; 447 mmu = "unknown";
440 448