[src/trunk]: src/sys/arch/evbarm/armadaxp lookup clock frequencies of ARMADA ...

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

details:   https://anonhg.NetBSD.org/src/rev/b0bced782ecf
branches:  trunk
changeset: 337462:b0bced782ecf
user:      hsuenaga <hsuenaga%NetBSD.org@localhost>
date:      Wed Apr 15 10:30:42 2015 +0000

description:
lookup clock frequencies of ARMADA 370 correctly.

diffstat:

 sys/arch/evbarm/armadaxp/armadaxp_machdep.c |  21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 36dbecdd6e10 -r b0bced782ecf sys/arch/evbarm/armadaxp/armadaxp_machdep.c
--- a/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Wed Apr 15 10:15:40 2015 +0000
+++ b/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Wed Apr 15 10:30:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armadaxp_machdep.c,v 1.9 2015/04/15 10:15:40 hsuenaga Exp $    */
+/*     $NetBSD: armadaxp_machdep.c,v 1.10 2015/04/15 10:30:42 hsuenaga 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.9 2015/04/15 10:15:40 hsuenaga Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.10 2015/04/15 10:30:42 hsuenaga Exp $");
 
 #include "opt_machdep.h"
 #include "opt_mvsoc.h"
@@ -92,6 +92,7 @@
 
 #include <evbarm/marvell/marvellreg.h>
 #include <evbarm/marvell/marvellvar.h>
+#include <dev/marvell/marvellreg.h>
 
 #include "mvpex.h"
 #include "com.h"
@@ -344,7 +345,21 @@
        /* Get CPU, system and timebase frequencies */
        extern vaddr_t misc_base;
        misc_base = MARVELL_INTERREGS_VBASE + ARMADAXP_MISC_BASE;
-       armadaxp_getclks();
+       switch (mvsoc_model()) {
+       case MARVELL_ARMADA370_MV6707:
+       case MARVELL_ARMADA370_MV6710:
+       case MARVELL_ARMADA370_MV6W11:
+               armada370_getclks();
+               break;
+       case MARVELL_ARMADAXP_MV78130:
+       case MARVELL_ARMADAXP_MV78160:
+       case MARVELL_ARMADAXP_MV78230:
+       case MARVELL_ARMADAXP_MV78260:
+       case MARVELL_ARMADAXP_MV78460:
+       default:
+               armadaxp_getclks();
+               break;
+       }
        mvsoc_clkgating = armadaxp_clkgating;
 
        /* Preconfigure interrupts */