Move Allwinner drivers that will soon be used by OpenBSD/arm64

to the new MI FDT driver directory.

"go ahead" kettenis@

16 files changed, 42 insertions, 43 deletions

diff --git a/sys/arch/armv7/sunxi/files.sunxi b/sys/arch/armv7/sunxi/files.sunxi
index 53222ded162..76caf06613d 100644
--- a/sys/arch/armv7/sunxi/files.sunxi
+++ b/sys/arch/armv7/sunxi/files.sunxi
@@ -1,12 +1,4 @@
-#	$OpenBSD: files.sunxi,v 1.17 2016/10/23 18:50:34 kettenis Exp $
-
-device	sxiccmu
-attach	sxiccmu at fdt
-file	arch/armv7/sunxi/sxiccmu.c		sxiccmu
-
-device	sxipio {}: gpiobus
-attach	sxipio at fdt
-file	arch/armv7/sunxi/sxipio.c		sxipio
+#	$OpenBSD: files.sunxi,v 1.18 2017/01/21 08:26:49 patrick Exp $
 
 device	sxiintc
 attach	sxiintc at fdt
@@ -20,24 +12,13 @@ device	sxidog
 attach	sxidog at fdt
 file	arch/armv7/sunxi/sxidog.c		sxidog
 
-device	sxirtc
-attach	sxirtc at fdt
-file	arch/armv7/sunxi/sxirtc.c		sxirtc
-
 device	sxiahci: scsi, atascsi
 attach	sxiahci at fdt
 file	arch/armv7/sunxi/sxiahci.c		sxiahci
 
-device	sximmc: sdmmcbus
-attach	sximmc at fdt
-file	arch/armv7/sunxi/sximmc.c		sximmc
-
 #attach ohci at sunxi with sxiohci
 #file	arch/armv7/sunxi/sxiohci.c		sxiohci
 
-attach	ehci at fdt with sxiehci
-file	arch/armv7/sunxi/sxiehci.c		sxiehci
-
 device	sxie: ether, ifnet, mii, ifmedia
 attach	sxie at fdt
 file	arch/armv7/sunxi/sxie.c			sxie
diff --git a/sys/arch/armv7/sunxi/sxiahci.c b/sys/arch/armv7/sunxi/sxiahci.c
index 8f9ef44cf3d..455ff94754b 100644
--- a/sys/arch/armv7/sunxi/sxiahci.c
+++ b/sys/arch/armv7/sunxi/sxiahci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxiahci.c,v 1.11 2016/08/22 11:24:45 kettenis Exp $	*/
+/*	$OpenBSD: sxiahci.c,v 1.12 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2013,2014 Artturi Alm
@@ -31,7 +31,7 @@
 #include <dev/ic/ahcivar.h>
 
 #include <armv7/armv7/armv7var.h>
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/armv7/sunxi/sxidog.c b/sys/arch/armv7/sunxi/sxidog.c
index 2f4c4c4a196..0ed4ef1ee3e 100644
--- a/sys/arch/armv7/sunxi/sxidog.c
+++ b/sys/arch/armv7/sunxi/sxidog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sxidog.c,v 1.11 2016/10/08 11:21:41 kettenis Exp $ */
+/* $OpenBSD: sxidog.c,v 1.12 2017/01/21 08:26:49 patrick Exp $ */
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  *
@@ -23,7 +23,7 @@
 #include <machine/fdt.h>
 
 #include <armv7/armv7/armv7_machdep.h>
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/fdt.h>
diff --git a/sys/arch/armv7/sunxi/sxie.c b/sys/arch/armv7/sunxi/sxie.c
index 79af320f532..c4bc430d582 100644
--- a/sys/arch/armv7/sunxi/sxie.c
+++ b/sys/arch/armv7/sunxi/sxie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxie.c,v 1.23 2016/10/22 11:00:02 jsg Exp $	*/
+/*	$OpenBSD: sxie.c,v 1.24 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2013 Artturi Alm
@@ -46,7 +46,7 @@
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/armv7/sunxi/sxiintc.c b/sys/arch/armv7/sunxi/sxiintc.c
index e593997afc1..ae4c1e6b8e9 100644
--- a/sys/arch/armv7/sunxi/sxiintc.c
+++ b/sys/arch/armv7/sunxi/sxiintc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxiintc.c,v 1.2 2016/08/06 18:21:34 patrick Exp $	*/
+/*	$OpenBSD: sxiintc.c,v 1.3 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2013 Artturi Alm
@@ -27,7 +27,7 @@
 #include <machine/fdt.h>
 
 #include <armv7/armv7/armv7var.h>
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 #include <armv7/sunxi/sxiintc.h>
 
 #include <dev/ofw/openfirm.h>
diff --git a/sys/arch/armv7/sunxi/sxitimer.c b/sys/arch/armv7/sunxi/sxitimer.c
index 34df3d97de9..b86644042ae 100644
--- a/sys/arch/armv7/sunxi/sxitimer.c
+++ b/sys/arch/armv7/sunxi/sxitimer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxitimer.c,v 1.9 2016/10/23 13:24:42 kettenis Exp $	*/
+/*	$OpenBSD: sxitimer.c,v 1.10 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2013 Raphael Graf <r@undefined.ch>
@@ -34,7 +34,7 @@
 #include <machine/intr.h>
 
 #include <armv7/armv7/armv7var.h>
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 /* #include <armv7/sunxi/sxipiovar.h> */
 
 #include <dev/ofw/openfirm.h>
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index bb184da34e8..e96b7100b5c 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.fdt,v 1.1 2017/01/03 19:57:01 kettenis Exp $
+#	$OpenBSD: files.fdt,v 1.2 2017/01/21 08:26:49 patrick Exp $
 #
 # Config file and device description for machine-independent FDT code.
 # Included by ports that need it.
@@ -6,3 +6,22 @@
 device	simplefb: wsemuldisplaydev, rasops15, rasops16, rasops24, rasops32
 attach	simplefb at fdt
 file	dev/fdt/simplefb.c		simplefb
+
+device	sxiccmu
+attach	sxiccmu at fdt
+file	dev/fdt/sxiccmu.c		sxiccmu
+
+device	sxipio {}: gpiobus
+attach	sxipio at fdt
+file	dev/fdt/sxipio.c		sxipio
+
+device	sxirtc
+attach	sxirtc at fdt
+file	dev/fdt/sxirtc.c		sxirtc
+
+device	sximmc: sdmmcbus
+attach	sximmc at fdt
+file	dev/fdt/sximmc.c		sximmc
+
+attach	ehci at fdt with sxiehci
+file	dev/fdt/sxiehci.c		sxiehci
diff --git a/sys/arch/armv7/sunxi/sunxireg.h b/sys/dev/fdt/sunxireg.h
index 6a74a1b47bd..83426392517 100644
--- a/sys/arch/armv7/sunxi/sunxireg.h
+++ b/sys/dev/fdt/sunxireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunxireg.h,v 1.9 2016/10/21 20:03:57 kettenis Exp $	*/
+/*	$OpenBSD: sunxireg.h,v 1.1 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2013 Artturi Alm
  *
diff --git a/sys/arch/armv7/sunxi/sxiccmu.c b/sys/dev/fdt/sxiccmu.c
index cf0f6d9c197..3d21773ac10 100644
--- a/sys/arch/armv7/sunxi/sxiccmu.c
+++ b/sys/dev/fdt/sxiccmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxiccmu.c,v 1.29 2017/01/21 05:19:08 patrick Exp $	*/
+/*	$OpenBSD: sxiccmu.c,v 1.1 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2013 Artturi Alm
@@ -29,7 +29,7 @@
 #include <machine/fdt.h>
 #include <machine/intr.h>
 
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/arch/armv7/sunxi/sxiccmu_clocks.h b/sys/dev/fdt/sxiccmu_clocks.h
index fdd0282623b..fdd0282623b 100644
--- a/sys/arch/armv7/sunxi/sxiccmu_clocks.h
+++ b/sys/dev/fdt/sxiccmu_clocks.h
diff --git a/sys/arch/armv7/sunxi/sxiehci.c b/sys/dev/fdt/sxiehci.c
index e552fc840e2..592387e6b67 100644
--- a/sys/arch/armv7/sunxi/sxiehci.c
+++ b/sys/dev/fdt/sxiehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxiehci.c,v 1.11 2017/01/21 05:19:53 patrick Exp $ */
+/*	$OpenBSD: sxiehci.c,v 1.1 2017/01/21 08:26:49 patrick Exp $ */
 
 /*
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
diff --git a/sys/arch/armv7/sunxi/sximmc.c b/sys/dev/fdt/sximmc.c
index 661dca18ee5..39d339607ef 100644
--- a/sys/arch/armv7/sunxi/sximmc.c
+++ b/sys/dev/fdt/sximmc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sximmc.c,v 1.11 2016/11/27 02:25:58 jsg Exp $ */
+/* $OpenBSD: sximmc.c,v 1.1 2017/01/21 08:26:49 patrick Exp $ */
 /* $NetBSD: awin_mmc.c,v 1.23 2015/11/14 10:32:40 bouyer Exp $ */
 
 /*-
diff --git a/sys/arch/armv7/sunxi/sxipio.c b/sys/dev/fdt/sxipio.c
index 88fcfe15c76..ba173e2b8c1 100644
--- a/sys/arch/armv7/sunxi/sxipio.c
+++ b/sys/dev/fdt/sxipio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxipio.c,v 1.19 2017/01/21 07:10:04 kettenis Exp $	*/
+/*	$OpenBSD: sxipio.c,v 1.1 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2010 Miodrag Vallat.
  * Copyright (c) 2013 Artturi Alm
@@ -34,8 +34,8 @@
 #include <dev/ofw/ofw_pinctrl.h>
 #include <dev/ofw/fdt.h>
 
-#include <armv7/sunxi/sunxireg.h>
-#include <armv7/sunxi/sxipiovar.h>
+#include <dev/fdt/sunxireg.h>
+#include <dev/fdt/sxipiovar.h>
 
 #include "gpio.h"
 
diff --git a/sys/arch/armv7/sunxi/sxipio_pins.h b/sys/dev/fdt/sxipio_pins.h
index 10f27f03e47..10f27f03e47 100644
--- a/sys/arch/armv7/sunxi/sxipio_pins.h
+++ b/sys/dev/fdt/sxipio_pins.h
diff --git a/sys/arch/armv7/sunxi/sxipiovar.h b/sys/dev/fdt/sxipiovar.h
index 6a020e8c7bd..6b0da0313c7 100644
--- a/sys/arch/armv7/sunxi/sxipiovar.h
+++ b/sys/dev/fdt/sxipiovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxipiovar.h,v 1.7 2017/01/04 12:15:37 kettenis Exp $	*/
+/*	$OpenBSD: sxipiovar.h,v 1.1 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2013 Artturi Alm
  *
diff --git a/sys/arch/armv7/sunxi/sxirtc.c b/sys/dev/fdt/sxirtc.c
index dcbba5edc0a..fd61fc043ee 100644
--- a/sys/arch/armv7/sunxi/sxirtc.c
+++ b/sys/dev/fdt/sxirtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxirtc.c,v 1.9 2017/01/08 14:12:32 kettenis Exp $	*/
+/*	$OpenBSD: sxirtc.c,v 1.1 2017/01/21 08:26:49 patrick Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis
  * Copyright (c) 2013 Artturi Alm
@@ -26,8 +26,7 @@
 #include <machine/bus.h>
 #include <machine/fdt.h>
 
-#include <armv7/armv7/armv7var.h>
-#include <armv7/sunxi/sunxireg.h>
+#include <dev/fdt/sunxireg.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/fdt.h>