[src/trunk]: src/sys/arch/sgimips/hpc Add dpclock driver (and minimal hpc1 go...

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

details:   https://anonhg.NetBSD.org/src/rev/9804cf935cf4
branches:  trunk
changeset: 555573:9804cf935cf4
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Sat Nov 22 03:58:52 2003 +0000

description:
Add dpclock driver (and minimal hpc1 goo) for ip20.

diffstat:

 sys/arch/sgimips/hpc/files.hpc |   6 +++++-
 sys/arch/sgimips/hpc/hpc.c     |  11 +++++++----
 sys/arch/sgimips/hpc/hpcreg.h  |   6 +++++-
 sys/arch/sgimips/hpc/hpcvar.h  |   7 ++++++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diffs (98 lines):

diff -r 50b08f8d5e1b -r 9804cf935cf4 sys/arch/sgimips/hpc/files.hpc
--- a/sys/arch/sgimips/hpc/files.hpc    Sat Nov 22 03:58:51 2003 +0000
+++ b/sys/arch/sgimips/hpc/files.hpc    Sat Nov 22 03:58:52 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpc,v 1.7 2003/10/17 06:49:34 sekiya Exp $
+# $NetBSD: files.hpc,v 1.8 2003/11/22 03:58:52 sekiya Exp $
 
 device sq: arp, ether, ifnet
 attach sq at hpc
@@ -14,6 +14,10 @@
 attach wdsc at hpc
 file   arch/sgimips/hpc/wdsc.c         wdsc
 
+device dpclock
+attach dpclock at hpc
+file   arch/sgimips/hpc/dpclock_hpc.c  dpclock
+
 device dsclock
 attach dsclock at hpc
 file   arch/sgimips/hpc/dsclock_hpc.c  dsclock
diff -r 50b08f8d5e1b -r 9804cf935cf4 sys/arch/sgimips/hpc/hpc.c
--- a/sys/arch/sgimips/hpc/hpc.c        Sat Nov 22 03:58:51 2003 +0000
+++ b/sys/arch/sgimips/hpc/hpc.c        Sat Nov 22 03:58:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpc.c,v 1.17 2003/11/20 08:34:05 sekiya Exp $  */
+/*     $NetBSD: hpc.c,v 1.18 2003/11/22 03:58:52 sekiya Exp $  */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.17 2003/11/20 08:34:05 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.18 2003/11/22 03:58:52 sekiya Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,8 +59,6 @@
        bus_addr_t hd_dmaoff;
        int hd_irq;
        int hd_sysmask;
-#define        HPCDEV_IP22             (1U << 0)       /* Indigo2 */
-#define        HPCDEV_IP24             (1U << 1)       /* Indy */
 } hpc_devices[] = {
        { "zsc",
          /* XXX Magic numbers */
@@ -88,6 +86,11 @@
          2,    /* XXX 2 = IRQ_LOCAL0 + 2 */
          HPCDEV_IP22 },
 
+       { "dpclock",
+         HPC1_PBUS_BBRAM, 0,
+         -1,
+         HPCDEV_IP20 },
+
        { "dsclock",
          HPC_PBUS_BBRAM, 0,
          -1,
diff -r 50b08f8d5e1b -r 9804cf935cf4 sys/arch/sgimips/hpc/hpcreg.h
--- a/sys/arch/sgimips/hpc/hpcreg.h     Sat Nov 22 03:58:51 2003 +0000
+++ b/sys/arch/sgimips/hpc/hpcreg.h     Sat Nov 22 03:58:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpcreg.h,v 1.7 2003/09/18 15:01:33 lonewolf Exp $      */
+/*     $NetBSD: hpcreg.h,v 1.8 2003/11/22 03:58:52 sekiya Exp $        */
 
 /*
  * Copyright (c) 2001 Rafal K. Boni
@@ -357,4 +357,8 @@
 #define HPC_PBUS_BBRAM         0x00060000      /* PBus battery-backed RAM
                                                 * external registers
                                                 */
+
+/* HPC1/HPC1.5 differs from HPC3 in several details. */
+
+#define HPC1_PBUS_BBRAM                0x00000e00
 #endif /* _ARCH_SGIMIPS_HPC_HPCREG_H_ */
diff -r 50b08f8d5e1b -r 9804cf935cf4 sys/arch/sgimips/hpc/hpcvar.h
--- a/sys/arch/sgimips/hpc/hpcvar.h     Sat Nov 22 03:58:51 2003 +0000
+++ b/sys/arch/sgimips/hpc/hpcvar.h     Sat Nov 22 03:58:52 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpcvar.h,v 1.4 2002/03/13 13:12:27 simonb Exp $        */
+/*     $NetBSD: hpcvar.h,v 1.5 2003/11/22 03:58:52 sekiya Exp $        */
 
 /*
  * Copyright (c) 2001 Rafal K. Boni
@@ -30,6 +30,11 @@
 #ifndef _ARCH_SGIMIPS_HPC_HPCVAR_H_
 #define        _ARCH_SGIMIPS_HPC_HPCVAR_H_
 
+#define HPCDEV_IP12            (1U << 0)       /* Indigo R3k, 4D/3x */
+#define HPCDEV_IP20            (1U << 1)       /* Indigo R4k */
+#define HPCDEV_IP22            (1U << 2)       /* Indigo2 */
+#define HPCDEV_IP24            (1U << 3)       /* Indy */
+
 struct hpc_attach_args {
        const char              *ha_name;       /* name of device */
        bus_addr_t              ha_devoff;      /* offset of device */