-/* $OpenBSD: ampintc.c,v 1.31 2022/03/12 14:40:41 mpi Exp $ */
+/* $OpenBSD: ampintc.c,v 1.32 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
*
#include <dev/ofw/fdt.h>
#include <dev/ofw/openfirm.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
/* registers */
#define ICD_DCR 0x000
--- /dev/null
+/* $OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:43 jsg Exp $ */
+/*
+ * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct simplebus_softc {
+ struct device sc_dev;
+ int sc_node;
+ bus_space_tag_t sc_iot;
+ bus_dma_tag_t sc_dmat;
+ int sc_acells;
+ int sc_scells;
+ int sc_pacells;
+ int sc_pscells;
+ struct bus_space sc_bus;
+ struct arm32_bus_dma_tag sc_dma;
+ int *sc_ranges;
+ int sc_rangeslen;
+ int *sc_dmaranges;
+ int sc_dmarangeslen;
+ int sc_early;
+ int sc_early_nodes[64];
+};
+
+extern void simplebus_attach(struct device *, struct device *, void *);
-/* $OpenBSD: simplebus.c,v 1.19 2022/03/12 14:40:41 mpi Exp $ */
+/* $OpenBSD: simplebus.c,v 1.20 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
*
#include <dev/ofw/ofw_clock.h>
#include <dev/ofw/ofw_power.h>
-#include <arm/fdt.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/fdt.h>
+#include <machine/simplebusvar.h>
int simplebus_match(struct device *, void *, void *);
void simplebus_attach(struct device *, struct device *, void *);
+++ /dev/null
-/* $OpenBSD: simplebusvar.h,v 1.3 2020/04/29 15:25:07 kettenis Exp $ */
-/*
- * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct simplebus_softc {
- struct device sc_dev;
- int sc_node;
- bus_space_tag_t sc_iot;
- bus_dma_tag_t sc_dmat;
- int sc_acells;
- int sc_scells;
- int sc_pacells;
- int sc_pscells;
- struct bus_space sc_bus;
- struct arm32_bus_dma_tag sc_dma;
- int *sc_ranges;
- int sc_rangeslen;
- int *sc_dmaranges;
- int sc_dmarangeslen;
- int sc_early;
- int sc_early_nodes[64];
-};
-
-extern void simplebus_attach(struct device *, struct device *, void *);
-/* $OpenBSD: agintc.c,v 1.53 2023/09/12 08:29:28 jmatthew Exp $ */
+/* $OpenBSD: agintc.c,v 1.54 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2007, 2009, 2011, 2017 Dale Rahn <drahn@dalerahn.com>
* Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
#include <dev/ofw/fdt.h>
#include <dev/ofw/openfirm.h>
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
#define ICC_PMR s3_0_c4_c6_0
#define ICC_IAR0 s3_0_c12_c8_0
-/* $OpenBSD: ampintc.c,v 1.30 2022/12/21 22:30:42 kettenis Exp $ */
+/* $OpenBSD: ampintc.c,v 1.31 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
*
#include <dev/ofw/fdt.h>
#include <dev/ofw/openfirm.h>
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
/* registers */
#define ICD_DCR 0x000
-/* $OpenBSD: apldc.c,v 1.10 2023/09/05 11:04:06 tobhe Exp $ */
+/* $OpenBSD: apldc.c,v 1.11 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2022 Mark Kettenis <kettenis@openbsd.org>
*
#include <dev/hid/hidmsvar.h>
#include <arm64/dev/rtkit.h>
-#include <arm64/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
#include "apldc.h"
-/* $OpenBSD: simplebus.c,v 1.17 2023/07/19 20:26:11 kettenis Exp $ */
+/* $OpenBSD: simplebus.c,v 1.18 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
*
#include <dev/ofw/fdt.h>
#include <dev/ofw/ofw_misc.h>
-#include <arm64/fdt.h>
-#include <arm64/dev/simplebusvar.h>
+#include <machine/fdt.h>
+#include <machine/simplebusvar.h>
int simplebus_match(struct device *, void *, void *);
void simplebus_attach(struct device *, struct device *, void *);
+++ /dev/null
-/* $OpenBSD: simplebusvar.h,v 1.3 2019/04/16 13:15:31 kettenis Exp $ */
-/*
- * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct simplebus_softc {
- struct device sc_dev;
- int sc_node;
- bus_space_tag_t sc_iot;
- bus_dma_tag_t sc_dmat;
- int sc_acells;
- int sc_scells;
- int sc_pacells;
- int sc_pscells;
- struct bus_space sc_bus;
- struct machine_bus_dma_tag sc_dma;
- int *sc_ranges;
- int sc_rangeslen;
- int *sc_dmaranges;
- int sc_dmarangeslen;
- int sc_early;
- int sc_early_nodes[64];
-};
-
-extern void simplebus_attach(struct device *, struct device *, void *);
--- /dev/null
+/* $OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:43 jsg Exp $ */
+/*
+ * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct simplebus_softc {
+ struct device sc_dev;
+ int sc_node;
+ bus_space_tag_t sc_iot;
+ bus_dma_tag_t sc_dmat;
+ int sc_acells;
+ int sc_scells;
+ int sc_pacells;
+ int sc_pscells;
+ struct bus_space sc_bus;
+ struct machine_bus_dma_tag sc_dma;
+ int *sc_ranges;
+ int sc_rangeslen;
+ int *sc_dmaranges;
+ int sc_dmarangeslen;
+ int sc_early;
+ int sc_early_nodes[64];
+};
+
+extern void simplebus_attach(struct device *, struct device *, void *);
-/* $OpenBSD: exdwusb.c,v 1.5 2021/10/24 17:52:27 mpi Exp $ */
+/* $OpenBSD: exdwusb.c,v 1.6 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
*
#include <sys/device.h>
#include <machine/fdt.h>
-
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_clock.h>
-/* $OpenBSD: expower.c,v 1.10 2021/10/24 17:52:27 mpi Exp $ */
+/* $OpenBSD: expower.c,v 1.11 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
*
#include <dev/ofw/ofw_misc.h>
#include <dev/ofw/fdt.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
#define HREAD4(sc, reg) \
(bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg)))
--- /dev/null
+/* $OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:43 jsg Exp $ */
+
+#include <arm/simplebusvar.h>
-/* $OpenBSD: mvmbus.c,v 1.4 2021/10/24 17:52:27 mpi Exp $ */
+/* $OpenBSD: mvmbus.c,v 1.5 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
*
#include <machine/bus.h>
#include <machine/fdt.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
#include <armv7/marvell/mvmbusvar.h>
#include <dev/ofw/openfirm.h>
-/* $OpenBSD: omcm.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
+/* $OpenBSD: omcm.c,v 1.4 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
*
#include <dev/ofw/openfirm.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
struct omcm_softc {
struct simplebus_softc sc_bus;
-/* $OpenBSD: omsysc.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
+/* $OpenBSD: omsysc.c,v 1.4 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
*
#include <dev/ofw/ofw_clock.h>
#include <dev/ofw/fdt.h>
-#include <arm/simplebus/simplebusvar.h>
+#include <machine/simplebusvar.h>
struct omsysc_softc {
struct simplebus_softc sc_bus;
-/* $OpenBSD: simplebus.c,v 1.2 2019/01/05 11:59:39 jsg Exp $ */
+/* $OpenBSD: simplebus.c,v 1.3 2023/09/22 01:10:43 jsg Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
#include <dev/ofw/fdt.h>
#include <machine/fdt.h>
-#include <octeon/dev/simplebusvar.h>
+#include <machine/simplebusvar.h>
int simplebus_match(struct device *, void *, void *);
void simplebus_attach(struct device *, struct device *, void *);
+++ /dev/null
-/* $OpenBSD: simplebusvar.h,v 1.1 2016/12/08 16:24:51 visa Exp $ */
-
-/*
- * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct simplebus_softc {
- struct device sc_dev;
- int sc_node;
- bus_space_tag_t sc_iot;
- bus_dma_tag_t sc_dmat;
- int sc_acells;
- int sc_scells;
- int sc_pacells;
- int sc_pscells;
- bus_space_t sc_bus;
- int *sc_ranges;
- int sc_rangeslen;
- int sc_early;
-};
-
-extern void simplebus_attach(struct device *, struct device *, void *);
--- /dev/null
+/* $OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:43 jsg Exp $ */
+
+/*
+ * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct simplebus_softc {
+ struct device sc_dev;
+ int sc_node;
+ bus_space_tag_t sc_iot;
+ bus_dma_tag_t sc_dmat;
+ int sc_acells;
+ int sc_scells;
+ int sc_pacells;
+ int sc_pscells;
+ bus_space_t sc_bus;
+ int *sc_ranges;
+ int sc_rangeslen;
+ int sc_early;
+};
+
+extern void simplebus_attach(struct device *, struct device *, void *);
-/* $OpenBSD: simplebus.c,v 1.5 2022/04/06 18:59:27 naddy Exp $ */
+/* $OpenBSD: simplebus.c,v 1.6 2023/09/22 01:10:44 jsg Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/fdt.h>
-#include <riscv64/fdt.h>
-#include <riscv64/dev/simplebusvar.h>
+#include <machine/fdt.h>
+#include <machine/simplebusvar.h>
int simplebus_match(struct device *, void *, void *);
void simplebus_attach(struct device *, struct device *, void *);
+++ /dev/null
-/* $OpenBSD: simplebusvar.h,v 1.2 2021/05/12 01:20:52 jsg Exp $ */
-
-/*
- * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-struct simplebus_softc {
- struct device sc_dev;
- int sc_node;
- bus_space_tag_t sc_iot;
- bus_dma_tag_t sc_dmat;
- int sc_acells;
- int sc_scells;
- int sc_pacells;
- int sc_pscells;
- struct bus_space sc_bus;
- struct machine_bus_dma_tag sc_dma;
- int *sc_ranges;
- int sc_rangeslen;
- int *sc_dmaranges;
- int sc_dmarangeslen;
- int sc_early;
- int sc_early_nodes[64];
-};
-
-extern void simplebus_attach(struct device *, struct device *, void *);
--- /dev/null
+/* $OpenBSD: simplebusvar.h,v 1.1 2023/09/22 01:10:44 jsg Exp $ */
+
+/*
+ * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct simplebus_softc {
+ struct device sc_dev;
+ int sc_node;
+ bus_space_tag_t sc_iot;
+ bus_dma_tag_t sc_dmat;
+ int sc_acells;
+ int sc_scells;
+ int sc_pacells;
+ int sc_pscells;
+ struct bus_space sc_bus;
+ struct machine_bus_dma_tag sc_dma;
+ int *sc_ranges;
+ int sc_rangeslen;
+ int *sc_dmaranges;
+ int sc_dmarangeslen;
+ int sc_early;
+ int sc_early_nodes[64];
+};
+
+extern void simplebus_attach(struct device *, struct device *, void *);
-/* $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>
*
#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>
-/* $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>
*
#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>
-/* $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>
#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>
-/* $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
#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>
-/* $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>
#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>
-/* $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>
*
#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>
-/* $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>
*
#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;
-/* $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>
*
#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
-/* $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
*
#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);
projects / openbsd / commitdiff