summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/armv7/imx/files.imx6
-rw-r--r--sys/dev/fdt/files.fdt6
-rw-r--r--sys/dev/fdt/imxccm.c (renamed from sys/arch/armv7/imx/imxccm.c)2
-rw-r--r--sys/dev/fdt/imxccm_clocks.h (renamed from sys/arch/armv7/imx/imxccm_clocks.h)0
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index a422f8cdc93..00b444d4b3a 100644
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,8 +1,4 @@
-# $OpenBSD: files.imx,v 1.27 2018/03/30 20:38:27 patrick Exp $
-
-device imxccm
-attach imxccm at fdt
-file arch/armv7/imx/imxccm.c imxccm
+# $OpenBSD: files.imx,v 1.28 2018/04/02 16:47:39 patrick Exp $
device imxiomuxc
attach imxiomuxc at fdt
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index f30501a7c36..e70bba21be0 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-# $OpenBSD: files.fdt,v 1.53 2018/04/02 16:45:56 kettenis Exp $
+# $OpenBSD: files.fdt,v 1.54 2018/04/02 16:47:39 patrick Exp $
#
# Config file and device description for machine-independent FDT code.
# Included by ports that need it.
@@ -194,6 +194,10 @@ device imxanatop
attach imxanatop at fdt
file dev/fdt/imxanatop.c imxanatop
+device imxccm
+attach imxccm at fdt
+file dev/fdt/imxccm.c imxccm
+
device imxesdhc: sdmmcbus
attach imxesdhc at fdt
file dev/fdt/imxesdhc.c imxesdhc
diff --git a/sys/arch/armv7/imx/imxccm.c b/sys/dev/fdt/imxccm.c
index 7f782c2d4c6..4153b754fde 100644
--- a/sys/arch/armv7/imx/imxccm.c
+++ b/sys/dev/fdt/imxccm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxccm.c,v 1.18 2018/04/02 16:39:20 patrick Exp $ */
+/* $OpenBSD: imxccm.c,v 1.1 2018/04/02 16:47:39 patrick Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
diff --git a/sys/arch/armv7/imx/imxccm_clocks.h b/sys/dev/fdt/imxccm_clocks.h
index 2bf09ffb954..2bf09ffb954 100644
--- a/sys/arch/armv7/imx/imxccm_clocks.h
+++ b/sys/dev/fdt/imxccm_clocks.h