diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-07-27 11:45:03 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2016-07-27 11:45:03 +0000 |
| commit | 1fd68993a9a5fbb0307078e17eb6ede551aedddf (patch) | |
| tree | 4d88596a74b88d513c2557c21203fcfc1bac3dbe /sys/arch/armv7/omap/ti_iic.c | |
| parent | 786148d7afd0301a999f964879ef4bb28778e6d9 (diff) | |
Instead of passing the raw reg property to simplebus nodes,
pass a pre-processed array of fdt_reg structs. This means
that the drivers don't have to understand the cell properties
themselves but can rely on the 64-bit addr/size pairs.
ok kettenis@
Diffstat (limited to 'sys/arch/armv7/omap/ti_iic.c')
| -rw-r--r-- | sys/arch/armv7/omap/ti_iic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/armv7/omap/ti_iic.c b/sys/arch/armv7/omap/ti_iic.c index 718e63c7f09..046a822aab3 100644 --- a/sys/arch/armv7/omap/ti_iic.c +++ b/sys/arch/armv7/omap/ti_iic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti_iic.c,v 1.6 2016/07/17 02:45:05 jsg Exp $ */ +/* $OpenBSD: ti_iic.c,v 1.7 2016/07/27 11:45:02 patrick Exp $ */ /* $NetBSD: ti_iic.c,v 1.4 2013/04/25 13:04:27 rkujawa Exp $ */ /* @@ -69,6 +69,7 @@ #include <armv7/omap/sitara_cm.h> #include <dev/ofw/openfirm.h> +#include <dev/ofw/fdt.h> #ifndef AM335X_I2C_SLAVE_ADDR #define AM335X_I2C_SLAVE_ADDR 0x01 @@ -167,7 +168,7 @@ ti_iic_attach(struct device *parent, struct device *self, void *aux) int irq, unit, len; char hwmods[128]; - if (faa->fa_nreg != 2 || (faa->fa_nintr != 1 && faa->fa_nintr != 3)) + if (faa->fa_nreg != 1 || (faa->fa_nintr != 1 && faa->fa_nintr != 3)) return; sc->sc_iot = faa->fa_iot; @@ -190,8 +191,8 @@ ti_iic_attach(struct device *parent, struct device *self, void *aux) sc->sc_rxthres = sc->sc_txthres = 4; - if (bus_space_map(sc->sc_iot, faa->fa_reg[0], - faa->fa_reg[1], 0, &sc->sc_ioh)) + if (bus_space_map(sc->sc_iot, faa->fa_reg[0].addr, + faa->fa_reg[0].size, 0, &sc->sc_ioh)) panic("%s: bus_space_map failed!", DEVNAME(sc)); sitara_cm_pinctrlbyname(faa->fa_node, "default"); |