From 6597406b2443f09e0e610765596659228f56703a Mon Sep 17 00:00:00 2001
From: kiyohara <kiyohara@NetBSD.org>
Date: Sat, 15 Mar 2014 13:56:19 +0000
Subject: [PATCH] Support options MVSOC_INTERREGS_PBASE for *old* Armada
 {XP,370} machines.

---
 sys/arch/evbarm/conf/OPENBLOCKS_AX3  |  3 ++-
 sys/arch/evbarm/conf/files.marvell   |  5 +++--
 sys/arch/evbarm/marvell/marvellreg.h | 11 +++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sys/arch/evbarm/conf/OPENBLOCKS_AX3 b/sys/arch/evbarm/conf/OPENBLOCKS_AX3
index e458cce0b68f..0c018e9f7da6 100644
--- a/sys/arch/evbarm/conf/OPENBLOCKS_AX3
+++ b/sys/arch/evbarm/conf/OPENBLOCKS_AX3
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_AX3,v 1.5 2013/12/23 02:37:35 kiyohara Exp $
+#	$NetBSD: OPENBLOCKS_AX3,v 1.6 2014/03/15 13:56:19 kiyohara Exp $
 #
 #	OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
 #
@@ -165,6 +165,7 @@ cpu0	at mainbus?
 
 # Marvell MV88F78260 ARMADA XP System-on-chip
 mvsoc0	at mainbus?
+options 	MVSOC_INTERREGS_PBASE=0xd0000000
 options 	MVSOC_FIXUP_DEVID=0x7826
 
 # On-chip Serial-ATA II Host Controller (SATAHC)
diff --git a/sys/arch/evbarm/conf/files.marvell b/sys/arch/evbarm/conf/files.marvell
index 8230ecebd41a..50cadbb5df18 100644
--- a/sys/arch/evbarm/conf/files.marvell
+++ b/sys/arch/evbarm/conf/files.marvell
@@ -1,4 +1,4 @@
-#	$NetBSD: files.marvell,v 1.3 2013/10/05 02:43:16 kiyohara Exp $
+#	$NetBSD: files.marvell,v 1.4 2014/03/15 13:56:19 kiyohara Exp $
 #
 # Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info
 #
@@ -13,4 +13,5 @@ file	arch/evbarm/marvell/marvell_machdep.c
 include	"arch/arm/marvell/files.marvell"
 
 # Some SoC(ARMADAXP) reports false DeviceID. 
-defparam opt_mvsoc.h				MVSOC_FIXUP_DEVID
+defparam opt_mvsoc.h				MVSOC_INTERREGS_PBASE
+						MVSOC_FIXUP_DEVID
diff --git a/sys/arch/evbarm/marvell/marvellreg.h b/sys/arch/evbarm/marvell/marvellreg.h
index 12966b2f8816..69eae9796d5c 100644
--- a/sys/arch/evbarm/marvell/marvellreg.h
+++ b/sys/arch/evbarm/marvell/marvellreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: marvellreg.h,v 1.3 2013/09/30 12:57:53 kiyohara Exp $  */
+/*	$NetBSD: marvellreg.h,v 1.4 2014/03/15 13:56:19 kiyohara Exp $  */
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * All rights reserved.
@@ -27,6 +27,7 @@
 #ifndef _EVBARM_MARVELLREG_H_
 #define _EVBARM_MARVELLREG_H_
 
+#include "opt_mvsoc.h"
 
 /*
  * Logical mapping for onboard/integrated peripherals
@@ -34,12 +35,10 @@
  */
 #define MARVELL_PEXMEM_PBASE			0xe0000000
 #define MARVELL_PEXMEM_SIZE			0x01000000
-#if !defined(ARMADAXP)
-#define MARVELL_INTERREGS_PBASE			0xf1000000
-#elif !defined(ORION) && !defined(KIRKWOOD) && !defined(MV78XX0)
-#define MARVELL_INTERREGS_PBASE			0xd0000000
+#if defined(MVSOC_INTERREGS_PBASE)
+#define MARVELL_INTERREGS_PBASE			MVSOC_INTERREGS_PBASE
 #else
-#define MARVELL_INTERREGS_PBASE			marvell_interregs_pbase
+#define MARVELL_INTERREGS_PBASE			0xf1000000
 #endif
 #define MARVELL_INTERREGS_SIZE			0x00100000
 #define MARVELL_PEXIO_PBASE			0xf2000000