[src/trunk]: src/sys/arch/evbarm/armadaxp Call some armadaxp functions with M...

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

details:   https://anonhg.NetBSD.org/src/rev/7d3cd1c58907
branches:  trunk
changeset: 790265:7d3cd1c58907
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Mon Sep 30 13:29:07 2013 +0000

description:
Call some armadaxp functions with MARVLL_INTERREG_PBASE.
And include arm/marvell/armadaxpreg.h instead of evbarm/armadaxp.

diffstat:

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

diffs (50 lines):

diff -r d8d71c05ced3 -r 7d3cd1c58907 sys/arch/evbarm/armadaxp/armadaxp_machdep.c
--- a/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Mon Sep 30 13:22:22 2013 +0000
+++ b/sys/arch/evbarm/armadaxp/armadaxp_machdep.c       Mon Sep 30 13:29:07 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: armadaxp_machdep.c,v 1.2 2013/05/29 23:50:34 rkujawa Exp $     */
+/*     $NetBSD: armadaxp_machdep.c,v 1.3 2013/09/30 13:29:07 kiyohara 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.2 2013/05/29 23:50:34 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.3 2013/09/30 13:29:07 kiyohara Exp $");
 
 #include "opt_machdep.h"
 #include "opt_mvsoc.h"
@@ -88,7 +88,7 @@
 
 #include <arm/marvell/mvsocreg.h>
 #include <arm/marvell/mvsocvar.h>
-#include <evbarm/armadaxp/armadaxpreg.h>
+#include <arm/marvell/armadaxpreg.h>
 
 #include <evbarm/marvell/marvellreg.h>
 #include <evbarm/marvell/marvellvar.h>
@@ -150,7 +150,7 @@
 #define KERNEL_VM_SIZE         0x10000000
 
 /* Prototypes */
-extern int armadaxp_l2_init(void);
+extern int armadaxp_l2_init(bus_addr_t);
 extern void armadaxp_io_coherency_init(void);
 
 void consinit(void);
@@ -352,11 +352,11 @@
        armadaxp_getclks();
 
        /* Preconfigure interrupts */
-       armadaxp_intr_bootstrap();
+       armadaxp_intr_bootstrap(MARVELL_INTERREGS_PBASE);
 
 #ifdef L2CACHE_ENABLE
        /* Initialize L2 Cache */
-       (void)armadaxp_l2_init();
+       (void)armadaxp_l2_init(MARVELL_INTERREGS_PBASE);
 #endif
 
 #ifdef AURORA_IO_CACHE_COHERENCY