summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2018-04-02 17:45:38 +0000
committerpatrick <patrick@openbsd.org>2018-04-02 17:45:38 +0000
commit66ed6850fbcaf211680e8ad2936d4093d2fc7d70 (patch)
tree1bf560cb95e943c43c719fa06dcbbe573daa3cd6
parentMove the code that sets the correct SATA phy settings into imxahc(4) (diff)
downloadwireguard-openbsd-66ed6850fbcaf211680e8ad2936d4093d2fc7d70.tar.xz
wireguard-openbsd-66ed6850fbcaf211680e8ad2936d4093d2fc7d70.zip
Move imxiomuxc(4) to sys/dev/fdt.
-rw-r--r--sys/arch/armv7/imx/files.imx6
-rw-r--r--sys/dev/fdt/files.fdt6
-rw-r--r--sys/dev/fdt/imxiomuxc.c (renamed from sys/arch/armv7/imx/imxiomuxc.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 33eca1f5939..5e6e571c745 100644
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,8 +1,4 @@
-# $OpenBSD: files.imx,v 1.29 2018/04/02 16:51:58 patrick Exp $
-
-device imxiomuxc
-attach imxiomuxc at fdt
-file arch/armv7/imx/imxiomuxc.c imxiomuxc
+# $OpenBSD: files.imx,v 1.30 2018/04/02 17:45:38 patrick Exp $
device imxdog
attach imxdog at fdt
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 9fb01b3e97d..1fa4e7feef0 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-# $OpenBSD: files.fdt,v 1.55 2018/04/02 16:51:58 patrick Exp $
+# $OpenBSD: files.fdt,v 1.56 2018/04/02 17:45:38 patrick Exp $
#
# Config file and device description for machine-independent FDT code.
# Included by ports that need it.
@@ -214,6 +214,10 @@ device imxiic: i2cbus
attach imxiic at fdt
file dev/fdt/imxiic.c imxiic
+device imxiomuxc
+attach imxiomuxc at fdt
+file dev/fdt/imxiomuxc.c imxiomuxc
+
device imxuart
attach imxuart at fdt
file dev/fdt/imxuart.c imxuart
diff --git a/sys/arch/armv7/imx/imxiomuxc.c b/sys/dev/fdt/imxiomuxc.c
index fd1e2fb7306..4cdc708b2ff 100644
--- a/sys/arch/armv7/imx/imxiomuxc.c
+++ b/sys/dev/fdt/imxiomuxc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxiomuxc.c,v 1.11 2018/04/02 17:43:08 patrick Exp $ */
+/* $OpenBSD: imxiomuxc.c,v 1.1 2018/04/02 17:45:38 patrick Exp $ */
/*
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
* Copyright (c) 2016 Mark Kettenis <kettenis@openbsd.org>