summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 20:02:29 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2018-03-30 20:02:29 +0000
commit8f2e2072ac6dcba5df34464ee0d9847b5b902362 (patch)
treeb31859e84785920a540fd532426c051be5135e09 /sys
parentc4cc7030bdd633256fa3271b6e8842ded0f1c8c9 (diff)
Move imxiic(4) to sys/dev/fdt.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/armv7/imx/files.imx6
-rw-r--r--sys/dev/fdt/files.fdt6
-rw-r--r--sys/dev/fdt/imxiic.c (renamed from sys/arch/armv7/imx/imxiic.c)4
-rw-r--r--sys/dev/fdt/imxiicvar.h (renamed from sys/arch/armv7/imx/imxiicvar.h)2
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx
index cb86c895b60..f6b02eb653d 100644
--- a/sys/arch/armv7/imx/files.imx
+++ b/sys/arch/armv7/imx/files.imx
@@ -1,4 +1,4 @@
-# $OpenBSD: files.imx,v 1.25 2018/03/30 19:50:55 patrick Exp $
+# $OpenBSD: files.imx,v 1.26 2018/03/30 20:02:28 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 imxiic: i2cbus
-attach imxiic at fdt
-file arch/armv7/imx/imxiic.c imxiic
-
device fec: ether, ifnet, mii, ifmedia
attach fec at fdt
file arch/armv7/imx/if_fec.c fec
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index b7c6504a9fd..32644969204 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-# $OpenBSD: files.fdt,v 1.49 2018/03/30 19:50:55 patrick Exp $
+# $OpenBSD: files.fdt,v 1.50 2018/03/30 20:02:28 patrick Exp $
#
# Config file and device description for machine-independent FDT code.
# Included by ports that need it.
@@ -197,3 +197,7 @@ file dev/fdt/imxgpio.c imxgpio
device imxesdhc: sdmmcbus
attach imxesdhc at fdt
file dev/fdt/imxesdhc.c imxesdhc
+
+device imxiic: i2cbus
+attach imxiic at fdt
+file dev/fdt/imxiic.c imxiic
diff --git a/sys/arch/armv7/imx/imxiic.c b/sys/dev/fdt/imxiic.c
index 79a7af8c81d..e2dd4528775 100644
--- a/sys/arch/armv7/imx/imxiic.c
+++ b/sys/dev/fdt/imxiic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxiic.c,v 1.14 2017/12/30 13:34:56 kettenis Exp $ */
+/* $OpenBSD: imxiic.c,v 1.1 2018/03/30 20:02:28 patrick Exp $ */
/*
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
*
@@ -23,7 +23,7 @@
#include <machine/bus.h>
#include <machine/fdt.h>
-#include <armv7/imx/imxiicvar.h>
+#include <dev/fdt/imxiicvar.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/armv7/imx/imxiicvar.h b/sys/dev/fdt/imxiicvar.h
index cd703366bfa..56824cac385 100644
--- a/sys/arch/armv7/imx/imxiicvar.h
+++ b/sys/dev/fdt/imxiicvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxiicvar.h,v 1.1 2013/09/06 20:45:54 patrick Exp $ */
+/* $OpenBSD: imxiicvar.h,v 1.1 2018/03/30 20:02:28 patrick Exp $ */
/*
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
*