[src/trunk]: src/sys/arch/evbarm/marvell Initialize mvTclk in SOC_getclks() b...

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

details:   https://anonhg.NetBSD.org/src/rev/f2425b591882
branches:  trunk
changeset: 791480:f2425b591882
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Wed Nov 20 12:52:24 2013 +0000

description:
Initialize mvTclk in SOC_getclks() before call consinit().
And more fast call set_cpufuncs().

diffstat:

 sys/arch/evbarm/marvell/marvell_machdep.c |  36 +++++++++++++++---------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diffs (78 lines):

diff -r d2b28a6e7a52 -r f2425b591882 sys/arch/evbarm/marvell/marvell_machdep.c
--- a/sys/arch/evbarm/marvell/marvell_machdep.c Wed Nov 20 12:36:16 2013 +0000
+++ b/sys/arch/evbarm/marvell/marvell_machdep.c Wed Nov 20 12:52:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: marvell_machdep.c,v 1.22 2013/09/30 12:57:53 kiyohara Exp $ */
+/*     $NetBSD: marvell_machdep.c,v 1.23 2013/11/20 12:52:24 kiyohara Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.22 2013/09/30 12:57:53 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.23 2013/11/20 12:52:24 kiyohara Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
@@ -218,6 +218,12 @@
 
        mvsoc_bootstrap(MARVELL_INTERREGS_VBASE);
 
+       /*
+        * Heads up ... Setup the CPU / MMU / TLB functions
+        */
+       if (set_cpufuncs())
+               panic("cpu not recognized!");
+
 #if (defined(ORION) || defined(KIRKWOOD) || defined(MV78XX0)) && \
     defined(ARMADAXP)
        int i;
@@ -233,12 +239,6 @@
        pmap_devmap_bootstrap((vaddr_t)read_ttb(), marvell_devmap);
 
        /*
-        * Heads up ... Setup the CPU / MMU / TLB functions
-        */
-       if (set_cpufuncs())
-               panic("cpu not recognized!");
-
-       /*
         * U-Boot doesn't use the virtual memory.
         *
         * Physical Address Range     Description
@@ -252,16 +252,6 @@
 
        cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
 
-       consinit();
-
-       /* Talk to the user */
-#ifndef EVBARM_BOARDTYPE
-#define EVBARM_BOARDTYPE       Marvell
-#endif
-#define BDSTR(s)       _BDSTR(s)
-#define _BDSTR(s)      #s
-       printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
-
        /* Get ready for splfoo() */
        switch (mvsoc_model()) {
 #ifdef ORION
@@ -354,6 +344,16 @@
                /* NOTREACHED */
        }
 
+       consinit();
+
+       /* Talk to the user */
+#ifndef EVBARM_BOARDTYPE
+#define EVBARM_BOARDTYPE       Marvell
+#endif
+#define BDSTR(s)       _BDSTR(s)
+#define _BDSTR(s)      #s
+       printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
+
        /* Reset PCI-Express space to window register. */
        window = mvsoc_target(memtag, &target, &attr, NULL, NULL);
        write_mlmbreg(MVSOC_MLMB_WCR(window),