[src/trunk]: src/sys/arch/arm/cortex Use mpcaa_off1 parameter for mapping sub...

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

details:   https://anonhg.NetBSD.org/src/rev/4acc02df1eb5
branches:  trunk
changeset: 362663:4acc02df1eb5
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Wed Jun 20 05:01:39 2018 +0000

description:
Use mpcaa_off1 parameter for mapping subregion.

diffstat:

 sys/arch/arm/cortex/a9tmr.c     |  12 ++++--------
 sys/arch/arm/cortex/a9tmr_var.h |   4 +---
 2 files changed, 5 insertions(+), 11 deletions(-)

diffs (51 lines):

diff -r 20d2d751882a -r 4acc02df1eb5 sys/arch/arm/cortex/a9tmr.c
--- a/sys/arch/arm/cortex/a9tmr.c       Wed Jun 20 04:04:50 2018 +0000
+++ b/sys/arch/arm/cortex/a9tmr.c       Wed Jun 20 05:01:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9tmr.c,v 1.15 2018/06/05 08:03:28 hkenken Exp $       */
+/*     $NetBSD: a9tmr.c,v 1.16 2018/06/20 05:01:39 hkenken Exp $       */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.15 2018/06/05 08:03:28 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.16 2018/06/20 05:01:39 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -147,12 +147,8 @@
        evcnt_attach_dynamic(&sc->sc_ev_missing_ticks, EVCNT_TYPE_MISC, NULL,
            device_xname(self), "missing interrupts");
 
-       bus_space_subregion(sc->sc_memt, sc->sc_memh, 
-           TMR_GLOBAL_BASE, TMR_GLOBAL_SIZE, &sc->sc_global_memh);
-       bus_space_subregion(sc->sc_memt, sc->sc_memh, 
-           TMR_PRIVATE_BASE, TMR_PRIVATE_SIZE, &sc->sc_private_memh);
-       bus_space_subregion(sc->sc_memt, sc->sc_memh, 
-           TMR_WDOG_BASE, TMR_WDOG_SIZE, &sc->sc_wdog_memh);
+       bus_space_subregion(sc->sc_memt, sc->sc_memh,
+           mpcaa->mpcaa_off1, TMR_GLOBAL_SIZE, &sc->sc_global_memh);
 
        if (mpcaa->mpcaa_irq != -1) {
                sc->sc_global_ih = intr_establish(mpcaa->mpcaa_irq, IPL_CLOCK,
diff -r 20d2d751882a -r 4acc02df1eb5 sys/arch/arm/cortex/a9tmr_var.h
--- a/sys/arch/arm/cortex/a9tmr_var.h   Wed Jun 20 04:04:50 2018 +0000
+++ b/sys/arch/arm/cortex/a9tmr_var.h   Wed Jun 20 05:01:39 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr_var.h,v 1.5 2018/06/05 08:03:28 hkenken Exp $ */
+/* $NetBSD: a9tmr_var.h,v 1.6 2018/06/20 05:01:39 hkenken Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,8 +36,6 @@
        bus_space_tag_t sc_memt;
        bus_space_handle_t sc_memh;
        bus_space_handle_t sc_global_memh;
-       bus_space_handle_t sc_private_memh;
-       bus_space_handle_t sc_wdog_memh;
        struct evcnt sc_ev_missing_ticks;
        uint32_t sc_freq;
        u_long sc_autoinc;