[src/trunk]: src/sys/arch/hpcsh/dev/hd64461 Standby AFE Clock, if use_afeck i...

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

details:   https://anonhg.NetBSD.org/src/rev/7772a646894b
branches:  trunk
changeset: 754805:7772a646894b
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Thu May 13 18:07:40 2010 +0000

description:
Standby AFE Clock, if use_afeck is 0.  Don't stop AFE Clock, if PERSONA boots
on serial console.

diffstat:

 sys/arch/hpcsh/dev/hd64461/hd64461.c     |  15 +++++++++------
 sys/arch/hpcsh/dev/hd64461/hd64461uart.c |   9 +++++++--
 sys/arch/hpcsh/dev/hd64461/hd64461var.h  |   4 +++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diffs (98 lines):

diff -r 1991e37049e8 -r 7772a646894b sys/arch/hpcsh/dev/hd64461/hd64461.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461.c      Thu May 13 18:04:58 2010 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461.c      Thu May 13 18:07:40 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461.c,v 1.22 2009/04/05 00:56:20 uwe Exp $ */
+/*     $NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $    */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.22 2009/04/05 00:56:20 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461.c,v 1.23 2010/05/13 18:07:40 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -59,6 +59,8 @@
 #endif
 };
 
+int use_afeck = 0;
+
 STATIC int hd64461_match(device_t, cfdata_t, void *);
 STATIC void hd64461_attach(device_t, device_t, void *);
 STATIC int hd64461_print(void *, const char *);
@@ -109,10 +111,11 @@
        stbcr |= HD64461_SYSSTBCR_STM0ST | HD64461_SYSSTBCR_STM1ST;
 
        /* no drivers for FIR and AFE */
-       stbcr |= HD64461_SYSSTBCR_SIRST
-               | HD64461_SYSSTBCR_SAFEST
-               | HD64461_SYSSTBCR_SAFECKE_IST
-               | HD64461_SYSSTBCR_SAFECKE_OST;
+       stbcr |= HD64461_SYSSTBCR_SIRST | HD64461_SYSSTBCR_SAFEST;
+
+       if (!use_afeck)
+               stbcr |=
+                   HD64461_SYSSTBCR_SAFECKE_IST | HD64461_SYSSTBCR_SAFECKE_OST;
 
        hd64461_reg_write_2(HD64461_SYSSTBCR_REG16, stbcr);
 
diff -r 1991e37049e8 -r 7772a646894b sys/arch/hpcsh/dev/hd64461/hd64461uart.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461uart.c  Thu May 13 18:04:58 2010 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461uart.c  Thu May 13 18:07:40 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461uart.c,v 1.25 2010/05/12 18:22:36 kiyohara Exp $        */
+/*     $NetBSD: hd64461uart.c,v 1.26 2010/05/13 18:07:40 kiyohara Exp $        */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.25 2010/05/12 18:22:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461uart.c,v 1.26 2010/05/13 18:07:40 kiyohara Exp $");
 
 #include "opt_kgdb.h"
 
@@ -116,6 +116,9 @@
            COM_TYPE_NORMAL, CONMODE);
 
        hd64461uart_chip.console = 1;
+       /* Don't stop to suply AFECK */
+       if (platid_match(&platid, &platid_mask_MACH_HITACHI_PERSONA))
+               use_afeck = 1;
 }
 
 #ifdef KGDB
@@ -137,6 +140,8 @@
                return 1;
        }
 
+       if (platid_match(&platid, &platid_mask_MACH_HITACHI_PERSONA))
+               use_afeck = 1;
        return 0;
 }
 #endif /* KGDB */
diff -r 1991e37049e8 -r 7772a646894b sys/arch/hpcsh/dev/hd64461/hd64461var.h
--- a/sys/arch/hpcsh/dev/hd64461/hd64461var.h   Thu May 13 18:04:58 2010 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461var.h   Thu May 13 18:07:40 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hd64461var.h,v 1.4 2008/04/28 20:23:22 martin Exp $    */
+/*     $NetBSD: hd64461var.h,v 1.5 2010/05/13 18:07:40 kiyohara Exp $  */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -59,6 +59,8 @@
        enum hd64461_module_id  ha_module_id;
 };
 
+extern int use_afeck;
+
 /*
  * Interrupt staff.
  */