diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-02-05 00:05:21 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-02-05 00:05:21 +0000 |
| commit | ab8e449484fd2b5931fdb1ae1e57b1952a47ab24 (patch) | |
| tree | 3926b3246d580d586aba3d9125c829922e38577a | |
| parent | 2b2659426904aed04816b09bf6450979ffb350dd (diff) | |
Move exuart(4) to sys/dev/fdt so it can be shared between arm64 and armv7.
ok kettenis@
| -rw-r--r-- | sys/arch/armv7/exynos/files.exynos | 7 | ||||
| -rw-r--r-- | sys/dev/fdt/exuart.c (renamed from sys/arch/armv7/exynos/exuart.c) | 11 | ||||
| -rw-r--r-- | sys/dev/fdt/exuartreg.h (renamed from sys/arch/armv7/exynos/exuartreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 6 |
4 files changed, 12 insertions, 12 deletions
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 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 index 66e05bf2a5d..66e05bf2a5d 100644 --- a/sys/arch/armv7/exynos/exuartreg.h +++ b/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 |