Module Name: src
Committed By: jmcneill
Date: Sun Mar 29 22:49:44 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_board.c amlogic_cpufreq.c
amlogic_io.c amlogic_var.h files.amlogic
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
Removed Files:
src/sys/arch/arm/amlogic: amlogic_space.c
Log Message:
Use shared armv7_generic_space
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/amlogic/amlogic_board.c \
src/sys/arch/arm/amlogic/files.amlogic
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_cpufreq.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/amlogic/amlogic_io.c \
src/sys/arch/arm/amlogic/amlogic_var.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/amlogic/amlogic_space.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/amlogic/amlogic_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/amlogic/amlogic_board.c
diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.9 src/sys/arch/arm/amlogic/amlogic_board.c:1.10
--- src/sys/arch/arm/amlogic/amlogic_board.c:1.9 Sun Mar 8 12:44:55 2015
+++ src/sys/arch/arm/amlogic/amlogic_board.c Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.9 2015/03/08 12:44:55 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.10 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.9 2015/03/08 12:44:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.10 2015/03/29 22:49:44 jmcneill Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -55,14 +55,14 @@ struct arm32_bus_dma_tag amlogic_dma_tag
};
#define CBUS_READ(x) \
- bus_space_read_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_read_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x))
#define CBUS_WRITE(x, v) \
- bus_space_write_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_write_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (v))
#define CBUS_SET_CLEAR(x, s, c) \
- amlogic_reg_set_clear(&amlogic_bs_tag, amlogic_core_bsh, \
+ amlogic_reg_set_clear(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (s), (c))
void
@@ -70,7 +70,7 @@ amlogic_bootstrap(void)
{
int error;
- error = bus_space_map(&amlogic_bs_tag, AMLOGIC_CORE_BASE,
+ error = bus_space_map(&armv7_generic_bs_tag, AMLOGIC_CORE_BASE,
AMLOGIC_CORE_SIZE, 0, &amlogic_core_bsh);
if (error)
panic("%s: failed to map CORE registers: %d", __func__, error);
@@ -260,7 +260,7 @@ amlogic_usbphy_clkgate_enable(int port)
void
amlogic_usbphy_init(int port)
{
- bus_space_tag_t bst = &amlogic_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_space_handle_t bsh = amlogic_core_bsh;
bus_size_t ctrl_reg, cfg_reg, adp_bc_reg, gpioao_reg;
uint32_t ctrl, cfg, adp_bc, gpioao;
Index: src/sys/arch/arm/amlogic/files.amlogic
diff -u src/sys/arch/arm/amlogic/files.amlogic:1.9 src/sys/arch/arm/amlogic/files.amlogic:1.10
--- src/sys/arch/arm/amlogic/files.amlogic:1.9 Sun Mar 22 17:28:22 2015
+++ src/sys/arch/arm/amlogic/files.amlogic Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.amlogic,v 1.9 2015/03/22 17:28:22 jmcneill Exp $
+# $NetBSD: files.amlogic,v 1.10 2015/03/29 22:49:44 jmcneill Exp $
#
# Configuration info for Amlogic ARM Peripherals
#
@@ -10,11 +10,11 @@ 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/amlogic/amlogic_board.c
file arch/arm/amlogic/amlogic_cpufreq.c
-file arch/arm/amlogic/amlogic_space.c
-file arch/arm/arm/bus_space_a4x.S
# On-board I/O
device amlogicio { [port=-1] } : bus_space_generic
Index: src/sys/arch/arm/amlogic/amlogic_cpufreq.c
diff -u src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.2 src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.3
--- src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.2 Tue Mar 17 22:29:40 2015
+++ src/sys/arch/arm/amlogic/amlogic_cpufreq.c Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_cpufreq.c,v 1.2 2015/03/17 22:29:40 jmcneill Exp $ */
+/* $NetBSD: amlogic_cpufreq.c,v 1.3 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.2 2015/03/17 22:29:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.3 2015/03/29 22:49:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -68,10 +68,10 @@ static u_int meson8b_cpu_get_rate(void);
static size_t meson8b_cpu_get_available(u_int *, size_t);
#define CBUS_READ(x) \
- bus_space_read_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_read_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x))
#define CBUS_WRITE(x, v) \
- bus_space_write_4(&amlogic_bs_tag, amlogic_core_bsh, \
+ bus_space_write_4(&armv7_generic_bs_tag, amlogic_core_bsh, \
AMLOGIC_CBUS_OFFSET + (x), (v))
void
Index: src/sys/arch/arm/amlogic/amlogic_io.c
diff -u src/sys/arch/arm/amlogic/amlogic_io.c:1.8 src/sys/arch/arm/amlogic/amlogic_io.c:1.9
--- src/sys/arch/arm/amlogic/amlogic_io.c:1.8 Sun Mar 22 17:28:22 2015
+++ src/sys/arch/arm/amlogic/amlogic_io.c Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_io.c,v 1.8 2015/03/22 17:28:22 jmcneill Exp $ */
+/* $NetBSD: amlogic_io.c,v 1.9 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_amlogic.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.8 2015/03/22 17:28:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.9 2015/03/29 22:49:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,8 +107,8 @@ amlogicio_attach(device_t parent, device
loc++) {
struct amlogicio_attach_args aio = {
.aio_loc = *loc,
- .aio_core_bst = &amlogic_bs_tag,
- .aio_core_a4x_bst = &amlogic_a4x_bs_tag,
+ .aio_core_bst = &armv7_generic_bs_tag,
+ .aio_core_a4x_bst = &armv7_generic_a4x_bs_tag,
.aio_bsh = amlogic_core_bsh,
.aio_dmat = &amlogic_dma_tag,
};
Index: src/sys/arch/arm/amlogic/amlogic_var.h
diff -u src/sys/arch/arm/amlogic/amlogic_var.h:1.8 src/sys/arch/arm/amlogic/amlogic_var.h:1.9
--- src/sys/arch/arm/amlogic/amlogic_var.h:1.8 Sat Mar 21 01:17:00 2015
+++ src/sys/arch/arm/amlogic/amlogic_var.h Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_var.h,v 1.8 2015/03/21 01:17:00 jmcneill Exp $ */
+/* $NetBSD: amlogic_var.h,v 1.9 2015/03/29 22:49:44 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -49,8 +49,8 @@ struct amlogicio_attach_args {
bus_dma_tag_t aio_dmat;
};
-extern struct bus_space amlogic_bs_tag;
-extern struct bus_space amlogic_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 amlogic_core_bsh;
extern struct arm32_bus_dma_tag amlogic_dma_tag;
Index: src/sys/arch/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.18 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.19
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.18 Sun Mar 22 13:53:33 2015
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c Sun Mar 29 22:49:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_machdep.c,v 1.18 2015/03/22 13:53:33 jmcneill Exp $ */
+/* $NetBSD: amlogic_machdep.c,v 1.19 2015/03/29 22:49:44 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.18 2015/03/22 13:53:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.19 2015/03/29 22:49:44 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -300,7 +300,7 @@ amlogic_get_ram_size(void)
{
const bus_space_handle_t ao_bsh =
AMLOGIC_CORE_VBASE + AMLOGIC_SRAM_OFFSET;
- return bus_space_read_4(&amlogic_bs_tag, ao_bsh, 0) << 20;
+ return bus_space_read_4(&armv7_generic_bs_tag, ao_bsh, 0) << 20;
}
/*
@@ -334,8 +334,8 @@ initarm(void *arg)
if (cbar) {
const bus_space_handle_t scu_bsh =
cbar - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE;
- uint32_t scu_cfg = bus_space_read_4(&amlogic_bs_tag, scu_bsh,
- SCU_CFG);
+ uint32_t scu_cfg = bus_space_read_4(&armv7_generic_bs_tag,
+ scu_bsh, SCU_CFG);
arm_cpu_max = (scu_cfg & SCU_CFG_CPUMAX) + 1;
membar_producer();
}
@@ -356,7 +356,7 @@ initarm(void *arg)
DPRINTF(" l2cc");
const bus_space_handle_t pl310_bh =
AMLOGIC_CORE_VBASE + AMLOGIC_PL310_OFFSET;
- arml2cc_init(&amlogic_bs_tag, pl310_bh, 0);
+ arml2cc_init(&armv7_generic_bs_tag, pl310_bh, 0);
#endif
DPRINTF(" cbar=%#x", armreg_cbar_read());
@@ -473,7 +473,7 @@ consinit(void)
#if NAMLOGIC_COM > 0
const bus_space_handle_t bsh =
AMLOGIC_CORE_VBASE + (consaddr - AMLOGIC_CORE_BASE);
- amlogic_com_cnattach(&amlogic_bs_tag, bsh, conspeed, conmode);
+ amlogic_com_cnattach(&armv7_generic_bs_tag, bsh, conspeed, conmode);
#else
#error only UART console is supported
#endif
@@ -482,7 +482,7 @@ consinit(void)
void
amlogic_reset(void)
{
- bus_space_tag_t bst = &amlogic_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
bus_space_handle_t bsh = amlogic_core_bsh;
bus_size_t off = AMLOGIC_CBUS_OFFSET;
@@ -503,7 +503,7 @@ amlogic_device_register(device_t self, v
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
struct mainbus_attach_args * const mb = aux;
- mb->mb_iot = &amlogic_bs_tag;
+ mb->mb_iot = &armv7_generic_bs_tag;
return;
}
@@ -581,7 +581,7 @@ static void
amlogic_mpinit_cpu(int cpu)
{
const bus_addr_t cbar = armreg_cbar_read();
- bus_space_tag_t bst = &amlogic_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
const bus_space_handle_t scu_bsh =
cbar - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE;
const bus_space_handle_t ao_bsh =
@@ -637,7 +637,7 @@ void
amlogic_mpinit(uint32_t mpinit_vec)
{
const bus_addr_t cbar = armreg_cbar_read();
- bus_space_tag_t bst = &amlogic_bs_tag;
+ bus_space_tag_t bst = &armv7_generic_bs_tag;
volatile int i;
uint32_t ctrl, hatched = 0;
int cpu;
