diff options
| -rw-r--r-- | sys/arch/arm64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 10 | ||||
| -rw-r--r-- | sys/dev/fdt/imxdwusb.c | 65 | ||||
| -rw-r--r-- | sys/dev/fdt/imxpd.c | 84 |
5 files changed, 3 insertions, 164 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index fd9cce5b88f..9df0d27c9b4 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.97 2019/03/28 10:15:23 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.98 2019/04/01 08:46:16 patrick Exp $ # # GENERIC machine description file # @@ -119,8 +119,6 @@ iic* at imxiic? imxesdhc* at fdt? sdmmc* at imxesdhc? imxsrc* at fdt? -imxpd* at fdt? -imxdwusb* at fdt? imxspi* at fdt? ssdfb* at iic? ssdfb* at spi? diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK index 201a5f0fcb2..be2f60ece36 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.81 2019/02/03 14:03:36 patrick Exp $ +# $OpenBSD: RAMDISK,v 1.82 2019/04/01 08:46:16 patrick Exp $ # # GENERIC machine description file # @@ -121,8 +121,6 @@ iic* at imxiic? imxesdhc* at fdt? sdmmc* at imxesdhc? imxsrc* at fdt? -imxpd* at fdt? -imxdwusb* at fdt? # Raspberry Pi 3 bcmaux* at fdt? diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index f90efcdf446..a09b4ba56af 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $OpenBSD: files.fdt,v 1.77 2019/02/03 14:03:36 patrick Exp $ +# $OpenBSD: files.fdt,v 1.78 2019/04/01 08:46:16 patrick Exp $ # # Config file and device description for machine-independent FDT code. # Included by ports that need it. @@ -242,10 +242,6 @@ device imxccm attach imxccm at fdt file dev/fdt/imxccm.c imxccm -device imxdwusb: fdt -attach imxdwusb at fdt -file dev/fdt/imxdwusb.c imxdwusb - device imxesdhc: sdmmcbus attach imxesdhc at fdt file dev/fdt/imxesdhc.c imxesdhc @@ -266,10 +262,6 @@ device imxiomuxc attach imxiomuxc at fdt file dev/fdt/imxiomuxc.c imxiomuxc -device imxpd: fdt -attach imxpd at fdt -file dev/fdt/imxpd.c imxpd - device imxrtc attach imxrtc at fdt file dev/fdt/imxrtc.c imxrtc diff --git a/sys/dev/fdt/imxdwusb.c b/sys/dev/fdt/imxdwusb.c deleted file mode 100644 index dc8760f0490..00000000000 --- a/sys/dev/fdt/imxdwusb.c +++ /dev/null @@ -1,65 +0,0 @@ -/* $OpenBSD: imxdwusb.c,v 1.1 2018/05/16 13:21:50 patrick Exp $ */ -/* - * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> - -#include <machine/bus.h> -#include <machine/fdt.h> - -#include <arm64/dev/simplebusvar.h> - -#include <dev/ofw/openfirm.h> -#include <dev/ofw/ofw_clock.h> -#include <dev/ofw/fdt.h> - -struct imxdwusb_softc { - struct simplebus_softc sc_sbus; -}; - -int imxdwusb_match(struct device *, void *, void *); -void imxdwusb_attach(struct device *, struct device *, void *); - -struct cfattach imxdwusb_ca = { - sizeof(struct imxdwusb_softc), imxdwusb_match, imxdwusb_attach -}; - -struct cfdriver imxdwusb_cd = { - NULL, "imxdwusb", DV_DULL -}; - -int -imxdwusb_match(struct device *parent, void *match, void *aux) -{ - struct fdt_attach_args *faa = aux; - - return OF_is_compatible(faa->fa_node, "fsl,imx8mq-dwc3"); -} - -void -imxdwusb_attach(struct device *parent, struct device *self, void *aux) -{ - struct imxdwusb_softc *sc = (struct imxdwusb_softc *)self; - struct fdt_attach_args *faa = aux; - - clock_set_assigned(faa->fa_node); - clock_enable_all(faa->fa_node); - reset_deassert_all(faa->fa_node); - - simplebus_attach(parent, &sc->sc_sbus.sc_dev, faa); -} diff --git a/sys/dev/fdt/imxpd.c b/sys/dev/fdt/imxpd.c deleted file mode 100644 index caccc3a996b..00000000000 --- a/sys/dev/fdt/imxpd.c +++ /dev/null @@ -1,84 +0,0 @@ -/* $OpenBSD: imxpd.c,v 1.1 2018/05/02 15:17:30 patrick Exp $ */ -/* - * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include <sys/types.h> -#include <sys/systm.h> -#include <sys/device.h> -#include <sys/malloc.h> - -#include <machine/cpufunc.h> -#include <machine/fdt.h> - -#include <dev/ofw/openfirm.h> -#include <dev/ofw/ofw_power.h> - -#define FSL_SIP_GPC 0xc2000000 -#define FSL_SIP_CONFIG_GPC_PM_DOMAIN 0x03 - -struct imxpd_softc { - struct device sc_dev; - struct power_domain_device sc_pd; - int sc_domain_id; -}; - -int imxpd_match(struct device *, void *, void *); -void imxpd_attach(struct device *, struct device *, void *); - -void imxpd_enable(void *, uint32_t *, int); - - -struct cfattach imxpd_ca = { - sizeof (struct imxpd_softc), imxpd_match, imxpd_attach -}; - -struct cfdriver imxpd_cd = { - NULL, "imxpd", DV_DULL -}; - -int -imxpd_match(struct device *parent, void *match, void *aux) -{ - struct fdt_attach_args *faa = aux; - - return OF_is_compatible(faa->fa_node, "fsl,imx8mq-pm-domain"); -} - -void -imxpd_attach(struct device *parent, struct device *self, void *aux) -{ - struct imxpd_softc *sc = (struct imxpd_softc *)self; - struct fdt_attach_args *faa = aux; - - sc->sc_domain_id = OF_getpropint(faa->fa_node, "domain-id", 0); - - sc->sc_pd.pd_node = faa->fa_node; - sc->sc_pd.pd_cookie = sc; - sc->sc_pd.pd_enable = imxpd_enable; - power_domain_register(&sc->sc_pd); - - printf("\n"); -} - -void -imxpd_enable(void *cookie, uint32_t *cells, int on) -{ - struct imxpd_softc *sc = cookie; - - /* Set up power domain */ - smc_call(FSL_SIP_GPC, FSL_SIP_CONFIG_GPC_PM_DOMAIN, - sc->sc_domain_id, on); -} |