summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 19:38:01 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 19:38:01 +0000
commit955d3523b749aac368c3f7a58c33e08a1e42e951 (patch)
tree73ca9edddd90338ffcfdce2fca140bf7500eb3c6
parent91609c278705d1ef7720a043e367b61c94cdb638 (diff)
Move imxgpio(4) to sys/dev/fdt so it can be shared between arm64 and armv7.
-rw-r--r--sys/arch/armv7/imx/files.imx6
-rw-r--r--sys/dev/fdt/files.fdt6
-rw-r--r--sys/dev/fdt/imxgpio.c (renamed from sys/arch/armv7/imx/imxgpio.c)2
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index 1b9c8d5ad6a..bc56cbb8f25 100644
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,4 +1,4 @@
-# $OpenBSD: files.imx,v 1.23 2018/03/30 09:26:14 patrick Exp $
+# $OpenBSD: files.imx,v 1.24 2018/03/30 19:38:00 patrick Exp $
device imxccm
attach imxccm at fdt
@@ -16,10 +16,6 @@ device imxanatop
attach imxanatop at fdt
file arch/armv7/imx/imxanatop.c imxanatop
-device imxgpio
-attach imxgpio at fdt
-file arch/armv7/imx/imxgpio.c imxgpio
-
device imxiic: i2cbus
attach imxiic at fdt
file arch/armv7/imx/imxiic.c imxiic
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 9754e27b5d4..b6be35701b2 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-# $OpenBSD: files.fdt,v 1.47 2018/03/30 09:26:14 patrick Exp $
+# $OpenBSD: files.fdt,v 1.48 2018/03/30 19:38:00 patrick Exp $
#
# Config file and device description for machine-independent FDT code.
# Included by ports that need it.
@@ -189,3 +189,7 @@ file dev/fdt/imxuart.c imxuart
device imxgpc
attach imxgpc at fdt
file dev/fdt/imxgpc.c imxgpc
+
+device imxgpio
+attach imxgpio at fdt
+file dev/fdt/imxgpio.c imxgpio
diff --git a/sys/arch/armv7/imx/imxgpio.c b/sys/dev/fdt/imxgpio.c
index c81667ba3b0..eefa4a0cbb3 100644
--- a/sys/arch/armv7/imx/imxgpio.c
+++ b/sys/dev/fdt/imxgpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxgpio.c,v 1.14 2018/03/30 19:30:57 patrick Exp $ */
+/* $OpenBSD: imxgpio.c,v 1.1 2018/03/30 19:38:00 patrick Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>