diff options
| -rw-r--r-- | sys/dev/fdt/bcm2835_dwctwo.c | 4 | ||||
| -rw-r--r-- | sys/dev/fdt/exuart.c | 7 | ||||
| -rw-r--r-- | sys/dev/fdt/tcpci.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/fdt/bcm2835_dwctwo.c b/sys/dev/fdt/bcm2835_dwctwo.c index 8f90fc30ed5..18e4b13638a 100644 --- a/sys/dev/fdt/bcm2835_dwctwo.c +++ b/sys/dev/fdt/bcm2835_dwctwo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcm2835_dwctwo.c,v 1.1 2020/05/14 15:44:07 kettenis Exp $ */ +/* $OpenBSD: bcm2835_dwctwo.c,v 1.2 2021/02/05 00:42:25 patrick Exp $ */ /* * Copyright (c) 2015 Masao Uebayashi <uebayasi@tombiinc.com> * @@ -115,7 +115,7 @@ bcm_dwctwo_attach(struct device *parent, struct device *self, void *aux) if (idx == -1) idx = 1; - sc->sc_ih = arm_intr_establish_fdt_idx(faa->fa_node, idx, IPL_USB, + sc->sc_ih = fdt_intr_establish_idx(faa->fa_node, idx, IPL_USB, dwc2_intr, (void *)&sc->sc_dwc2, sc->sc_dwc2.sc_bus.bdev.dv_xname); if (sc->sc_ih == NULL) panic("%s: intr_establish failed!", __func__); diff --git a/sys/dev/fdt/exuart.c b/sys/dev/fdt/exuart.c index 89532c8fbba..3887a76cc9d 100644 --- a/sys/dev/fdt/exuart.c +++ b/sys/dev/fdt/exuart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exuart.c,v 1.3 2021/02/05 00:13:37 patrick Exp $ */ +/* $OpenBSD: exuart.c,v 1.4 2021/02/05 00:42:25 patrick Exp $ */ /* * Copyright (c) 2005 Dale Rahn <drahn@motorola.com> * @@ -146,7 +146,7 @@ exuart_init_cons(void) } stdout_node = OF_finddevice("/serial@13800000"); } - + if (fdt_get_reg(node, 0, ®)) return; @@ -171,8 +171,7 @@ exuart_attach(struct device *parent, struct device *self, void *aux) if (faa->fa_nreg < 1) return; - - sc->sc_irq = arm_intr_establish_fdt(faa->fa_node, IPL_TTY, + sc->sc_irq = fdt_intr_establish(faa->fa_node, IPL_TTY, exuart_intr, sc, sc->sc_dev.dv_xname); sc->sc_iot = faa->fa_iot; diff --git a/sys/dev/fdt/tcpci.c b/sys/dev/fdt/tcpci.c index 46cf1ae91f8..d521fb388c3 100644 --- a/sys/dev/fdt/tcpci.c +++ b/sys/dev/fdt/tcpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpci.c,v 1.1 2020/04/27 21:30:52 patrick Exp $ */ +/* $OpenBSD: tcpci.c,v 1.2 2021/02/05 00:42:25 patrick Exp $ */ /* * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se> * @@ -232,7 +232,7 @@ tcpci_attach(struct device *parent, struct device *self, void *aux) pinctrl_byname(sc->sc_node, "default"); task_set(&sc->sc_task, tcpci_task, sc); - sc->sc_ih = arm_intr_establish_fdt(sc->sc_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(sc->sc_node, IPL_BIO, tcpci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); |