From 13358d45b65fda5edb39dd7490722130c2ad0d86 Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Fri, 5 Feb 2021 00:05:20 +0000
Subject: [PATCH] Move exuart(4) to sys/dev/fdt so it can be shared between
 arm64 and armv7.

ok kettenis@
---
 sys/arch/armv7/exynos/files.exynos             |  7 +------
 sys/{arch/armv7/exynos => dev/fdt}/exuart.c    | 11 ++++++-----
 sys/{arch/armv7/exynos => dev/fdt}/exuartreg.h |  0
 sys/dev/fdt/files.fdt                          |  6 +++++-
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename sys/{arch/armv7/exynos => dev/fdt}/exuart.c (99%)
 rename sys/{arch/armv7/exynos => dev/fdt}/exuartreg.h (100%)

diff --git a/sys/arch/armv7/exynos/files.exynos b/sys/arch/armv7/exynos/files.exynos
index d49c4ae7ebd..f332937899d 100644
--- a/sys/arch/armv7/exynos/files.exynos
+++ b/sys/arch/armv7/exynos/files.exynos
@@ -1,9 +1,4 @@
-#	$OpenBSD: files.exynos,v 1.12 2017/12/23 10:23:34 kettenis Exp $
-
-# serial ports
-device exuart
-attach	exuart at fdt
-file	arch/armv7/exynos/exuart.c		exuart
+#	$OpenBSD: files.exynos,v 1.13 2021/02/05 00:05:20 patrick Exp $
 
 #device exdisplay: wsemuldisplaydev, rasops16
 #attach exdisplay at exynos
diff --git a/sys/arch/armv7/exynos/exuart.c b/sys/dev/fdt/exuart.c
similarity index 99%
rename from sys/arch/armv7/exynos/exuart.c
rename to sys/dev/fdt/exuart.c
index ee5490ec239..a9d5b547eb8 100644
--- a/sys/arch/armv7/exynos/exuart.c
+++ b/sys/dev/fdt/exuart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exuart.c,v 1.19 2021/02/04 23:36:31 patrick Exp $ */
+/* $OpenBSD: exuart.c,v 1.1 2021/02/05 00:05:20 patrick Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@motorola.com>
  *
@@ -29,19 +29,20 @@
 #include <sys/select.h>
 #include <sys/kernel.h>
 
+#include <machine/bus.h>
+#include <machine/fdt.h>
+
 #include <dev/cons.h>
 
 #ifdef DDB
 #include <ddb/db_var.h>
 #endif
 
-#include <machine/bus.h>
-#include <machine/fdt.h>
 #include <arm/armv7/armv7var.h>
-#include <armv7/exynos/exuartreg.h>
+#include <dev/fdt/exuartreg.h>
 
-#include <dev/ofw/fdt.h>
 #include <dev/ofw/openfirm.h>
+#include <dev/ofw/fdt.h>
 
 #define DEVUNIT(x)      (minor(x) & 0x7f)
 #define DEVCUA(x)       (minor(x) & 0x80)
diff --git a/sys/arch/armv7/exynos/exuartreg.h b/sys/dev/fdt/exuartreg.h
similarity index 100%
rename from sys/arch/armv7/exynos/exuartreg.h
rename to sys/dev/fdt/exuartreg.h
diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt
index 376aaf3b903..e0004d7ba0d 100644
--- a/sys/dev/fdt/files.fdt
+++ b/sys/dev/fdt/files.fdt
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.fdt,v 1.145 2020/12/18 18:24:45 patrick Exp $
+#	$OpenBSD: files.fdt,v 1.146 2021/02/05 00:05:20 patrick Exp $
 #
 # Config file and device description for machine-independent FDT code.
 # Included by ports that need it.
@@ -148,6 +148,10 @@ device	exrtc
 attach	exrtc at fdt
 file	dev/fdt/exrtc.c			exrtc
 
+device	exuart
+attach	exuart at fdt
+file	dev/fdt/exuart.c		exuart
+
 # ARM PrimeCell PL061 General Purpose Input/Output
 device	plgpio
 attach	plgpio at fdt
-- 
2.20.1