[src/netbsd-1-6]: src/sys/arch/arm pullup-1-6 ticket #208:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/38cefeac2429
branches:  netbsd-1-6
changeset: 527785:38cefeac2429
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jun 07 18:33:13 2002 +0000

description:
pullup-1-6 ticket #208:

syssrc/sys/arch/arm/arm/cpufunc.c 1.46
syssrc/sys/arch/arm/arm32/cpu.c 1.38
syssrc/sys/arch/arm/include/armreg.h 1.19

Original log message:

Add the CPU ID for the 600MHz i80321 part.

diffstat:

 sys/arch/arm/arm/cpufunc.c    |  4 ++--
 sys/arch/arm/arm32/cpu.c      |  8 +++++---
 sys/arch/arm/include/armreg.h |  5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r bf6c1c2ae767 -r 38cefeac2429 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Thu Jun 06 09:58:45 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Fri Jun 07 18:33:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.44.4.1 2002/05/23 15:50:52 tv Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.44.4.2 2002/06/07 18:33:13 thorpej Exp $ */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -906,7 +906,7 @@
        }
 #endif /* CPU_XSCALE_80200 */
 #ifdef CPU_XSCALE_80321
-       if (cputype == CPU_ID_80321) {
+       if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600) {
                i80321_icu_init();
 
                /*
diff -r bf6c1c2ae767 -r 38cefeac2429 sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Thu Jun 06 09:58:45 2002 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Fri Jun 07 18:33:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.37 2002/05/12 15:05:41 ichiro Exp $  */
+/*     $NetBSD: cpu.c,v 1.37.4.1 2002/06/07 18:33:14 thorpej Exp $     */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -45,7 +45,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.37 2002/05/12 15:05:41 ichiro Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.37.4.1 2002/06/07 18:33:14 thorpej Exp $");
 
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -293,7 +293,9 @@
        { CPU_ID_80200,         CPU_CLASS_XSCALE,       "i80200",
          xscale_steppings },
 
-       { CPU_ID_80321,         CPU_CLASS_XSCALE,       "i80321",
+       { CPU_ID_80321_400,     CPU_CLASS_XSCALE,       "i80321 400MHz",
+         xscale_steppings },
+       { CPU_ID_80321_600,     CPU_CLASS_XSCALE,       "i80321 600MHz",
          xscale_steppings },
 
        { CPU_ID_PXA250,        CPU_CLASS_XSCALE,       "PXA250",
diff -r bf6c1c2ae767 -r 38cefeac2429 sys/arch/arm/include/armreg.h
--- a/sys/arch/arm/include/armreg.h     Thu Jun 06 09:58:45 2002 +0000
+++ b/sys/arch/arm/include/armreg.h     Fri Jun 07 18:33:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armreg.h,v 1.18 2002/04/27 15:50:59 ichiro Exp $       */
+/*     $NetBSD: armreg.h,v 1.18.4.1 2002/06/07 18:33:15 thorpej Exp $  */
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -191,7 +191,8 @@
 #define CPU_ID_80200           0x69052000
 #define CPU_ID_PXA250          0x69052100
 #define CPU_ID_PXA210          0x69052120
-#define        CPU_ID_80321            0x69052420
+#define        CPU_ID_80321_400        0x69052420
+#define        CPU_ID_80321_600        0x69052430
 
 /* ARM3-specific coprocessor 15 registers */
 #define ARM3_CP15_FLUSH                1