diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-05-02 08:15:56 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-05-02 08:15:56 +0000 |
| commit | e745dff34c8b0de52da4f946c480d9cae831323c (patch) | |
| tree | 72221689fe098a9caa64a9147f2ae28c7042d034 /sys/arch/armish | |
| parent | 3c702be99add97af0c6607ca0e072c99ebf6ef01 (diff) | |
Rework mainbus and implement simplebus to be able to span a tree-like
topology based on device tree information. Introduce a common attach
args structure to be used for all fdt-capable bus devices.
ok jsg@ kettenis@
Diffstat (limited to 'sys/arch/armish')
| -rw-r--r-- | sys/arch/armish/conf/files.armish | 6 | ||||
| -rw-r--r-- | sys/arch/armish/dev/i80321_mainbus.c | 4 | ||||
| -rw-r--r-- | sys/arch/armish/dev/obio.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armish/conf/files.armish b/sys/arch/armish/conf/files.armish index 9bb866adbf8..62a038a5bee 100644 --- a/sys/arch/armish/conf/files.armish +++ b/sys/arch/armish/conf/files.armish @@ -1,4 +1,4 @@ -# $OpenBSD: files.armish,v 1.19 2016/01/15 13:20:06 tobiasu Exp $ +# $OpenBSD: files.armish,v 1.20 2016/05/02 08:15:55 patrick Exp $ maxpartitions 16 maxusers 2 8 64 @@ -32,14 +32,14 @@ include "dev/i2c/files.i2c" # ARM i80321 files include "arch/arm/xscale/files.i80321" -attach iopxs at mainbus with iopxs_mainbus +attach iopxs at fdt with iopxs_mainbus file arch/armish/dev/i80321_mainbus.c iopxs_mainbus file arch/armish/dev/pci_addr_fixup.c iopxs file arch/armish/dev/iq80321_pci.c iopxs # IQ80310 on-board devices (including CPLD) device obio {addr, [size = -1], [width = -1], [xint = -1]}: bus_space_generic -attach obio at mainbus +attach obio at fdt file arch/armish/dev/obio.c obio file arch/armish/dev/obio_space.c obio diff --git a/sys/arch/armish/dev/i80321_mainbus.c b/sys/arch/armish/dev/i80321_mainbus.c index ce711aac6fd..1004e79c96c 100644 --- a/sys/arch/armish/dev/i80321_mainbus.c +++ b/sys/arch/armish/dev/i80321_mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i80321_mainbus.c,v 1.10 2006/09/15 23:36:11 drahn Exp $ */ +/* $OpenBSD: i80321_mainbus.c,v 1.11 2016/05/02 08:15:55 patrick Exp $ */ /* $NetBSD: i80321_mainbus.c,v 1.16 2005/12/15 01:44:00 briggs Exp $ */ /* @@ -91,7 +91,7 @@ int i80321_mainbus_found; int i80321_mainbus_match(struct device *parent, void *match, void *aux) { - struct mainbus_attach_args *ma = aux; + union mainbus_attach_args *ma = aux; struct cfdata *cf = match; if (i80321_mainbus_found) diff --git a/sys/arch/armish/dev/obio.c b/sys/arch/armish/dev/obio.c index 0704ba7532e..c5186aaab93 100644 --- a/sys/arch/armish/dev/obio.c +++ b/sys/arch/armish/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.3 2006/06/01 17:06:16 drahn Exp $ */ +/* $OpenBSD: obio.c,v 1.4 2016/05/02 08:15:55 patrick Exp $ */ /* $NetBSD: obio.c,v 1.14 2005/12/11 12:17:09 christos Exp $ */ /* @@ -73,7 +73,7 @@ int obio_found; int obio_match(struct device *parent, void *match, void *aux) { - struct mainbus_attach_args *ma = aux; + union mainbus_attach_args *ma = aux; struct cfdata *cf = match; if (obio_found) |