Author: cognet
Date: Tue Aug 30 23:32:38 2016
New Revision: 305097
URL: https://svnweb.freebsd.org/changeset/base/305097
Log:
Nuke obio_bs_tag, it was used before it was initialized, and
arm_base_bs_tag is the same, anyway.
Modified:
head/sys/arm/xscale/i8134x/crb_machdep.c
head/sys/arm/xscale/i8134x/obio.c
head/sys/arm/xscale/i8134x/obiovar.h
head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
Modified: head/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- head/sys/arm/xscale/i8134x/crb_machdep.c Tue Aug 30 23:30:26 2016
(r305096)
+++ head/sys/arm/xscale/i8134x/crb_machdep.c Tue Aug 30 23:32:38 2016
(r305097)
@@ -286,7 +286,7 @@ initarm(struct arm_boot_params *abp)
cpu_setup();
i80321_calibrate_delay();
- i81342_sdram_bounds(obio_bs_tag, IOP34X_VADDR, &memstart, &memsize);
+ i81342_sdram_bounds(arm_base_bs_tag, IOP34X_VADDR, &memstart, &memsize);
physmem = memsize / PAGE_SIZE;
cninit();
/* Set stack for exception handlers */
Modified: head/sys/arm/xscale/i8134x/obio.c
==============================================================================
--- head/sys/arm/xscale/i8134x/obio.c Tue Aug 30 23:30:26 2016
(r305096)
+++ head/sys/arm/xscale/i8134x/obio.c Tue Aug 30 23:32:38 2016
(r305097)
@@ -56,8 +56,6 @@ __FBSDID("$FreeBSD$");
#include <arm/xscale/i8134x/i81342reg.h>
#include <arm/xscale/i8134x/obiovar.h>
-bus_space_tag_t obio_bs_tag;
-
static int
obio_probe(device_t dev)
{
@@ -69,8 +67,7 @@ obio_attach(device_t dev)
{
struct obio_softc *sc = device_get_softc(dev);
- obio_bs_tag = arm_base_bs_tag;
- sc->oba_st = obio_bs_tag;
+ sc->oba_st = arm_base_bs_tag;
sc->oba_rman.rm_type = RMAN_ARRAY;
sc->oba_rman.rm_descr = "OBIO I/O";
if (rman_init(&sc->oba_rman) != 0 ||
Modified: head/sys/arm/xscale/i8134x/obiovar.h
==============================================================================
--- head/sys/arm/xscale/i8134x/obiovar.h Tue Aug 30 23:30:26 2016
(r305096)
+++ head/sys/arm/xscale/i8134x/obiovar.h Tue Aug 30 23:32:38 2016
(r305097)
@@ -50,6 +50,5 @@ struct obio_softc {
struct rman oba_irq_rman;
};
-extern bus_space_tag_t obio_bs_tag;
#endif /* _IQ80321_OBIOVAR_H_ */
Modified: head/sys/arm/xscale/i8134x/uart_cpu_i81342.c
==============================================================================
--- head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Tue Aug 30 23:30:26
2016 (r305096)
+++ head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Tue Aug 30 23:32:38
2016 (r305097)
@@ -54,14 +54,14 @@ uart_cpu_getdev(int devtype, struct uart
di->ops = uart_getops(&uart_ns8250_class);
di->bas.chan = 0;
- di->bas.bst = obio_bs_tag;
+ di->bas.bst = arm_base_bs_tag;
di->bas.regshft = 2;
di->bas.rclk = 33334000;
di->baudrate = 115200;
di->databits = 8;
di->stopbits = 1;
di->parity = UART_PARITY_NONE;
- uart_bus_space_io = obio_bs_tag;
+ uart_bus_space_io = arm_base_bs_tag;
uart_bus_space_mem = NULL;
di->bas.bsh = IOP34X_UART0_VADDR;
return (0);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
