9 files changed, 18 insertions, 42 deletions
diff --git a/sys/dev/fdt/amldwusb.c b/sys/dev/fdt/amldwusb.c
index 9cffb0fa86f..bd34666daa9 100644
--- a/sys/dev/fdt/amldwusb.c
+++ b/sys/dev/fdt/amldwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amldwusb.c,v 1.4 2021/10/24 17:52:26 mpi Exp $	*/
+/*	$OpenBSD: amldwusb.c,v 1.5 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2019 Mark kettenis <kettenis@openbsd.org>
  *
@@ -22,8 +22,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/hidwusb.c b/sys/dev/fdt/hidwusb.c
index 002a69d029a..85cb060cfc8 100644
--- a/sys/dev/fdt/hidwusb.c
+++ b/sys/dev/fdt/hidwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hidwusb.c,v 1.3 2021/10/24 17:52:26 mpi Exp $	*/
+/*	$OpenBSD: hidwusb.c,v 1.4 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -21,8 +21,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/imxdwusb.c b/sys/dev/fdt/imxdwusb.c
index d7b51ff3608..09e8f4ddc9d 100644
--- a/sys/dev/fdt/imxdwusb.c
+++ b/sys/dev/fdt/imxdwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxdwusb.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
+/*	$OpenBSD: imxdwusb.c,v 1.6 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
@@ -22,8 +22,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/mvmdio.c b/sys/dev/fdt/mvmdio.c
index 914fc03ce82..a3adee9f8fe 100644
--- a/sys/dev/fdt/mvmdio.c
+++ b/sys/dev/fdt/mvmdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvmdio.c,v 1.4 2021/10/24 17:52:26 mpi Exp $	*/
+/*	$OpenBSD: mvmdio.c,v 1.5 2023/09/22 01:10:44 jsg Exp $	*/
 /*	$NetBSD: if_mvneta.c,v 1.41 2015/04/15 10:15:40 hsuenaga Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
@@ -35,12 +35,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#ifdef __armv7__
-#include <arm/simplebus/simplebusvar.h>
-#else
-#include <arm64/dev/simplebusvar.h>
-#endif
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/qcdwusb.c b/sys/dev/fdt/qcdwusb.c
index 4a36dc32762..2ad99f6e6f0 100644
--- a/sys/dev/fdt/qcdwusb.c
+++ b/sys/dev/fdt/qcdwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qcdwusb.c,v 1.1 2022/11/06 12:12:45 patrick Exp $	*/
+/*	$OpenBSD: qcdwusb.c,v 1.2 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2020, 2022 Patrick Wildt <patrick@blueri.se>
@@ -22,8 +22,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/rkdwusb.c b/sys/dev/fdt/rkdwusb.c
index 7cb99c7d096..bcef26cf0c5 100644
--- a/sys/dev/fdt/rkdwusb.c
+++ b/sys/dev/fdt/rkdwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkdwusb.c,v 1.4 2021/10/24 17:52:26 mpi Exp $	*/
+/*	$OpenBSD: rkdwusb.c,v 1.5 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -21,8 +21,7 @@
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
-
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_clock.h>
diff --git a/sys/dev/fdt/rkgrf.c b/sys/dev/fdt/rkgrf.c
index b3c5d76474b..585a471757e 100644
--- a/sys/dev/fdt/rkgrf.c
+++ b/sys/dev/fdt/rkgrf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkgrf.c,v 1.6 2023/04/06 19:02:29 kettenis Exp $	*/
+/*	$OpenBSD: rkgrf.c,v 1.7 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -27,11 +27,7 @@
 #include <dev/ofw/ofw_misc.h>
 #include <dev/ofw/fdt.h>
 
-#ifdef __armv7__
-#include <arm/simplebus/simplebusvar.h>
-#else
-#include <arm64/dev/simplebusvar.h>
-#endif
+#include <machine/simplebusvar.h>
 
 struct rkgrf_softc {
 	struct simplebus_softc	sc_sbus;
diff --git a/sys/dev/fdt/rkpinctrl.c b/sys/dev/fdt/rkpinctrl.c
index 8b036c8c5f0..159b8cc4980 100644
--- a/sys/dev/fdt/rkpinctrl.c
+++ b/sys/dev/fdt/rkpinctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkpinctrl.c,v 1.13 2023/06/21 01:10:17 jsg Exp $	*/
+/*	$OpenBSD: rkpinctrl.c,v 1.14 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -29,11 +29,7 @@
 #include <dev/ofw/ofw_pinctrl.h>
 #include <dev/ofw/fdt.h>
 
-#ifdef __armv7__
-#include <arm/simplebus/simplebusvar.h>
-#else
-#include <arm64/dev/simplebusvar.h>
-#endif
+#include <machine/simplebusvar.h>
 
 /* Pin numbers (from devicetree bindings) */
 #define RK_PA0		0
diff --git a/sys/dev/fdt/syscon.c b/sys/dev/fdt/syscon.c
index 314f27667b2..09a87c1b74d 100644
--- a/sys/dev/fdt/syscon.c
+++ b/sys/dev/fdt/syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscon.c,v 1.7 2021/10/24 17:52:27 mpi Exp $	*/
+/*	$OpenBSD: syscon.c,v 1.8 2023/09/22 01:10:44 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis
  *
@@ -26,13 +26,7 @@
 #include <dev/ofw/ofw_misc.h>
 #include <dev/ofw/fdt.h>
 
-#ifdef __armv7__
-#include <arm/simplebus/simplebusvar.h>
-#elif defined(__riscv64__)
-#include <riscv64/dev/simplebusvar.h>
-#else
-#include <arm64/dev/simplebusvar.h>
-#endif
+#include <machine/simplebusvar.h>
 
 extern void (*cpuresetfn)(void);
 extern void (*powerdownfn)(void);