summaryrefslogtreecommitdiff
path: root/sys/arch/armv7
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 09:26:15 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 09:26:15 +0000
commit8475ed1a4c36620ea9295e79784b16622d9cfdb1 (patch)
tree920d17724acffe62309fb6208a8dec8d439d529b /sys/arch/armv7
parent187692fc65df0f68e4089df7578f3ad930aeaf24 (diff)
Move imxgpc(4) to sys/dev/fdt so it can be shared between arm64 and armv7.
ok kettenis@
Diffstat (limited to 'sys/arch/armv7')
-rw-r--r--sys/arch/armv7/imx/files.imx6
-rw-r--r--sys/arch/armv7/imx/imxgpc.c63
2 files changed, 1 insertions, 68 deletions
diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index 73e2e2cce1e..1b9c8d5ad6a 100644
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,4 +1,4 @@
-# $OpenBSD: files.imx,v 1.22 2018/03/29 20:33:53 patrick Exp $
+# $OpenBSD: files.imx,v 1.23 2018/03/30 09:26:14 patrick Exp $
device imxccm
attach imxccm at fdt
@@ -8,10 +8,6 @@ device imxiomuxc
attach imxiomuxc at fdt
file arch/armv7/imx/imxiomuxc.c imxiomuxc
-device imxgpc
-attach imxgpc at fdt
-file arch/armv7/imx/imxgpc.c imxgpc
-
device imxdog
attach imxdog at fdt
file arch/armv7/imx/imxdog.c imxdog
diff --git a/sys/arch/armv7/imx/imxgpc.c b/sys/arch/armv7/imx/imxgpc.c
deleted file mode 100644
index 1205a0629ab..00000000000
--- a/sys/arch/armv7/imx/imxgpc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $OpenBSD: imxgpc.c,v 1.2 2016/08/06 17:18:38 kettenis Exp $ */
-/*
- * Copyright (c) 2016 Mark Kettenis
- *
- * 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/fdt.h>
-
-#include <dev/ofw/openfirm.h>
-
-struct imxgpc_softc {
- struct device sc_dev;
- struct interrupt_controller sc_ic;
-};
-
-int imxgpc_match(struct device *, void *, void *);
-void imxgpc_attach(struct device *, struct device *, void *);
-
-struct cfattach imxgpc_ca = {
- sizeof(struct imxgpc_softc), imxgpc_match, imxgpc_attach
-};
-
-struct cfdriver imxgpc_cd = {
- NULL, "imxgpc", DV_DULL
-};
-
-int
-imxgpc_match(struct device *parent, void *match, void *aux)
-{
- struct fdt_attach_args *faa = aux;
-
- return OF_is_compatible(faa->fa_node, "fsl,imx6q-gpc");
-}
-
-void
-imxgpc_attach(struct device *parent, struct device *self, void *aux)
-{
- struct fdt_attach_args *faa = aux;
- struct imxgpc_softc *sc = (struct imxgpc_softc *)self;
-
- sc->sc_ic.ic_node = faa->fa_node;
- sc->sc_ic.ic_cookie = &sc->sc_ic;
- sc->sc_ic.ic_establish = arm_intr_parent_establish_fdt;
- sc->sc_ic.ic_disestablish = arm_intr_parent_disestablish_fdt;
- arm_intr_register_fdt(&sc->sc_ic);
-
- printf("\n");
-}