diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/imx/files.imx | 6 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 6 | ||||
| -rw-r--r-- | sys/dev/fdt/imxehci.c (renamed from sys/arch/armv7/imx/imxehci.c) | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx index 5e6e571c745..41945d77a6c 100644 --- a/sys/arch/armv7/imx/files.imx +++ b/sys/arch/armv7/imx/files.imx @@ -1,13 +1,9 @@ -# $OpenBSD: files.imx,v 1.30 2018/04/02 17:45:38 patrick Exp $ +# $OpenBSD: files.imx,v 1.31 2020/04/23 22:14:49 patrick Exp $ device imxdog attach imxdog at fdt file arch/armv7/imx/imxdog.c imxdog -device imxehci: usbus -attach imxehci at fdt -file arch/armv7/imx/imxehci.c imxehci - device imxahci: scsi, atascsi attach imxahci at fdt file arch/armv7/imx/imxahci.c imxahci diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index 473d68d4aad..a9b4082a944 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $OpenBSD: files.fdt,v 1.124 2020/04/22 09:48:44 kettenis Exp $ +# $OpenBSD: files.fdt,v 1.125 2020/04/23 22:14:49 patrick Exp $ # # Config file and device description for machine-independent FDT code. # Included by ports that need it. @@ -406,6 +406,10 @@ device imxccm attach imxccm at fdt file dev/fdt/imxccm.c imxccm +device imxehci: usbus +attach imxehci at fdt +file dev/fdt/imxehci.c imxehci + device imxesdhc: sdmmcbus attach imxesdhc at fdt file dev/fdt/imxesdhc.c imxesdhc diff --git a/sys/arch/armv7/imx/imxehci.c b/sys/dev/fdt/imxehci.c index 759a0eab3c8..04bc6593ba7 100644 --- a/sys/arch/armv7/imx/imxehci.c +++ b/sys/dev/fdt/imxehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxehci.c,v 1.25 2018/06/11 09:22:50 kettenis Exp $ */ +/* $OpenBSD: imxehci.c,v 1.1 2020/04/23 22:14:49 patrick Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> * @@ -222,7 +222,7 @@ imxehci_attach(struct device *parent, struct device *self, void *aux) EOWRITE4(&sc->sc, EHCI_PORTSC(1), EOREAD4(&sc->sc, EHCI_PORTSC(1)) & ~EHCI_PS_PTS_UTMI_MASK); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, ehci_intr, &sc->sc, devname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); @@ -241,7 +241,7 @@ imxehci_attach(struct device *parent, struct device *self, void *aux) goto out; intr: - arm_intr_disestablish(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); sc->sc_ih = NULL; mem2: bus_space_unmap(sc->sc.iot, sc->nc_ioh, misc_reg[1]); @@ -264,7 +264,7 @@ imxehci_detach(struct device *self, int flags) return (rv); if (sc->sc_ih != NULL) { - arm_intr_disestablish(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); sc->sc_ih = NULL; } |