d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke obio_bs_tag, it was used before it was initialized, and

Browse Source 
arm_base_bs_tag is the same, anyway.
This commit is contained in:
Olivier Houchard 2016-08-30 23:32:38 +00:00
parent 5d621118fe
commit 3681e5c3ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=305097
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/xscale/i8134x/crb_machdep.c
View File

@ -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 */

5
sys/arm/xscale/i8134x/obio.c
View File

@ -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 ||

1
sys/arm/xscale/i8134x/obiovar.h
View File

@ -50,6 +50,5 @@ struct obio_softc {
struct rman oba_irq_rman;
};
extern bus_space_tag_t obio_bs_tag;
#endif /* _IQ80321_OBIOVAR_H_ */

4
sys/arm/xscale/i8134x/uart_cpu_i81342.c
View File

@ -54,14 +54,14 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
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);