Module Name: src
Committed By: hkenken
Date: Wed Jun 20 05:01:40 UTC 2018
Modified Files:
src/sys/arch/arm/cortex: a9tmr.c a9tmr_var.h
Log Message:
Use mpcaa_off1 parameter for mapping subregion.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/cortex/a9tmr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/cortex/a9tmr_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.15 src/sys/arch/arm/cortex/a9tmr.c:1.16
--- src/sys/arch/arm/cortex/a9tmr.c:1.15 Tue Jun 5 08:03:28 2018
+++ src/sys/arch/arm/cortex/a9tmr.c Wed Jun 20 05:01:39 2018
@@ -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 @@ a9tmr_attach(device_t parent, device_t s
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,
Index: src/sys/arch/arm/cortex/a9tmr_var.h
diff -u src/sys/arch/arm/cortex/a9tmr_var.h:1.5 src/sys/arch/arm/cortex/a9tmr_var.h:1.6
--- src/sys/arch/arm/cortex/a9tmr_var.h:1.5 Tue Jun 5 08:03:28 2018
+++ src/sys/arch/arm/cortex/a9tmr_var.h Wed Jun 20 05:01:39 2018
@@ -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 @@ struct a9tmr_softc {
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;
