[src/trunk]: src/sys/arch/evbarm/armadaxp Default comfreq to mvTclk if CONSFR...

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

details:   https://anonhg.NetBSD.org/src/rev/375845aeff60
branches:  trunk
changeset: 794563:375845aeff60
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Mar 18 06:17:55 2014 +0000

description:
Default comfreq to mvTclk if CONSFREQ is not defined.

diffstat:

 sys/arch/evbarm/armadaxp/armadaxp_machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 43a4024b602d -r 375845aeff60 sys/arch/evbarm/armadaxp/armadaxp_machdep.c
--- a/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Tue Mar 18 05:50:06 2014 +0000
+++ b/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Tue Mar 18 06:17:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $    */
+/*     $NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $        */
 /*******************************************************************************
 Copyright (C) Marvell International Ltd. and its affiliates
 
@@ -37,7 +37,7 @@
 *******************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.6 2013/12/23 04:12:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.7 2014/03/18 06:17:55 matt Exp $");
 
 #include "opt_machdep.h"
 #include "opt_mvsoc.h"
@@ -414,7 +414,7 @@
 #define        CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
 #endif
 #ifndef CONSFREQ
-#define        CONSFREQ 250000000
+#define        CONSFREQ 0
 #endif
 static const int       comcnspeed = CONSPEED;
 static const int       comcnfreq  = CONSFREQ;
@@ -435,7 +435,7 @@
            uint32_t, int);
 
        if (mvuart_cnattach(&mvsoc_bs_tag, comcnaddr, comcnspeed,
-                       comcnfreq, comcnmode))
+                       comcnfreq ? comcnfreq : mvTclk , comcnmode))
                panic("Serial console can not be initialized.");
 #endif
 }