Module Name: src
Committed By: jmcneill
Date: Sun Mar 29 22:27:04 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_io.c tegra_mc.c tegra_pmc.c
tegra_soc.c tegra_var.h
src/sys/arch/evbarm/tegra: tegra_machdep.c
Removed Files:
src/sys/arch/arm/nvidia: tegra_space.c
Log Message:
Use shared armv7_generic_space
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/files.tegra \
src/sys/arch/arm/nvidia/tegra_io.c src/sys/arch/arm/nvidia/tegra_mc.c \
src/sys/arch/arm/nvidia/tegra_pmc.c src/sys/arch/arm/nvidia/tegra_soc.c \
src/sys/arch/arm/nvidia/tegra_var.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/nvidia/tegra_space.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/tegra/tegra_machdep.c
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/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.1 src/sys/arch/arm/nvidia/files.tegra:1.2
--- src/sys/arch/arm/nvidia/files.tegra:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/files.tegra Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.1 2015/03/29 10:41:59 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.2 2015/03/29 22:27:04 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -10,10 +10,10 @@ file arch/arm/arm32/arm32_boot.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_reboot.c
file arch/arm/arm32/irq_dispatch.S
+file arch/arm/arm32/armv7_generic_space.c
+file arch/arm/arm/bus_space_a4x.S
file arch/arm/nvidia/tegra_soc.c
-file arch/arm/nvidia/tegra_space.c
-file arch/arm/arm/bus_space_a4x.S
file arch/arm/nvidia/soc_tegra124.c soc_tegra124
# On-board I/O
Index: src/sys/arch/arm/nvidia/tegra_io.c
diff -u src/sys/arch/arm/nvidia/tegra_io.c:1.1 src/sys/arch/arm/nvidia/tegra_io.c:1.2
--- src/sys/arch/arm/nvidia/tegra_io.c:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_io.c Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_io.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_io.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_tegra.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_io.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,8 +127,8 @@ tegraio_scan(device_t self, bus_space_ha
for (const struct tegra_locators *loc = locators; loc < eloc; loc++) {
struct tegraio_attach_args tio = {
.tio_loc = *loc,
- .tio_bst = &tegra_bs_tag,
- .tio_a4x_bst = &tegra_a4x_bs_tag,
+ .tio_bst = &armv7_generic_bs_tag,
+ .tio_a4x_bst = &armv7_generic_a4x_bs_tag,
.tio_bsh = bsh,
.tio_dmat = &tegra_dma_tag,
};
Index: src/sys/arch/arm/nvidia/tegra_mc.c
diff -u src/sys/arch/arm/nvidia/tegra_mc.c:1.1 src/sys/arch/arm/nvidia/tegra_mc.c:1.2
--- src/sys/arch/arm/nvidia/tegra_mc.c:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_mc.c Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_mc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_mc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -91,7 +91,7 @@ tegra_mc_memsize(void)
bst = mc_softc->sc_bst;
bsh = mc_softc->sc_bsh;
} else {
- bst = &tegra_bs_tag;
+ bst = &armv7_generic_bs_tag;
bus_space_subregion(bst, tegra_apb_bsh,
TEGRA_MC_OFFSET, TEGRA_MC_SIZE, &bsh);
}
Index: src/sys/arch/arm/nvidia/tegra_pmc.c
diff -u src/sys/arch/arm/nvidia/tegra_pmc.c:1.1 src/sys/arch/arm/nvidia/tegra_pmc.c:1.2
--- src/sys/arch/arm/nvidia/tegra_pmc.c:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_pmc.c Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pmc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_pmc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -92,7 +92,7 @@ tegra_pmc_reset(void)
bst = pmc_softc->sc_bst;
bsh = pmc_softc->sc_bsh;
} else {
- bst = &tegra_bs_tag;
+ bst = &armv7_generic_bs_tag;
bus_space_subregion(bst, tegra_apb_bsh,
TEGRA_PMC_OFFSET, TEGRA_PMC_SIZE, &bsh);
}
Index: src/sys/arch/arm/nvidia/tegra_soc.c
diff -u src/sys/arch/arm/nvidia/tegra_soc.c:1.1 src/sys/arch/arm/nvidia/tegra_soc.c:1.2
--- src/sys/arch/arm/nvidia/tegra_soc.c:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_soc.c Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_soc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_soc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.1 2015/03/29 10:41:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_soc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -65,11 +65,14 @@ static void tegra_mpinit(void);
void
tegra_bootstrap(void)
{
- bus_space_map(&tegra_bs_tag, TEGRA_HOST1X_BASE, TEGRA_HOST1X_SIZE, 0,
+ bus_space_map(&armv7_generic_bs_tag,
+ TEGRA_HOST1X_BASE, TEGRA_HOST1X_SIZE, 0,
&tegra_host1x_bsh);
- bus_space_map(&tegra_bs_tag, TEGRA_APB_BASE, TEGRA_APB_SIZE, 0,
+ bus_space_map(&armv7_generic_bs_tag,
+ TEGRA_APB_BASE, TEGRA_APB_SIZE, 0,
&tegra_apb_bsh);
- bus_space_map(&tegra_bs_tag, TEGRA_AHB_A2_BASE, TEGRA_AHB_A2_SIZE, 0,
+ bus_space_map(&armv7_generic_bs_tag,
+ TEGRA_AHB_A2_BASE, TEGRA_AHB_A2_SIZE, 0,
&tegra_ahb_a2_bsh);
curcpu()->ci_data.cpu_cc_freq = 696000000; /* XXX */
@@ -101,7 +104,7 @@ tegra_chip_id(void)
static u_int chip_id = 0;
if (!chip_id) {
- const bus_space_tag_t bst = &tegra_bs_tag;
+ const bus_space_tag_t bst = &armv7_generic_bs_tag;
const bus_space_handle_t bsh = tegra_apb_bsh;
const uint32_t v = bus_space_read_4(bst, bsh,
APB_MISC_GP_HIDREV_0_REG);
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.1 src/sys/arch/arm/nvidia/tegra_var.h:1.2
--- src/sys/arch/arm/nvidia/tegra_var.h:1.1 Sun Mar 29 10:41:59 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -51,8 +51,8 @@ struct tegraio_attach_args {
bus_dma_tag_t tio_dmat;
};
-extern struct bus_space tegra_bs_tag;
-extern struct bus_space tegra_a4x_bs_tag;
+extern struct bus_space armv7_generic_bs_tag;
+extern struct bus_space armv7_generic_a4x_bs_tag;
extern bus_space_handle_t tegra_host1x_bsh;
extern bus_space_handle_t tegra_apb_bsh;
extern bus_space_handle_t tegra_ahb_a2_bsh;
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.2 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.3
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.2 Sun Mar 29 10:55:11 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Sun Mar 29 22:27:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.2 2015/03/29 10:55:11 jmcneill Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.3 2015/03/29 22:27:04 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.2 2015/03/29 10:55:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.3 2015/03/29 22:27:04 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -296,7 +296,7 @@ consinit(void)
consinit_called = true;
#if NCOM > 0
- const bus_space_tag_t bst = &tegra_a4x_bs_tag;
+ const bus_space_tag_t bst = &armv7_generic_a4x_bs_tag;
if (comcnattach(bst, CONSADDR, CONSPEED, TEGRA_UART_FREQ,
COM_TYPE_NORMAL, CONMODE)) {
panic("Serial console cannot be initialized.");
@@ -314,7 +314,7 @@ tegra_device_register(device_t self, voi
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
struct mainbus_attach_args * const mb = aux;
- mb->mb_iot = &tegra_bs_tag;
+ mb->mb_iot = &armv7_generic_bs_tag;
return;
}
