Module Name: src
Committed By: thorpej
Date: Thu Feb 4 22:36:54 UTC 2021
Modified Files:
src/sys/arch/arm/acpi: acpi_platform.c
src/sys/arch/arm/altera: cycv_platform.c
src/sys/arch/arm/amlogic: meson_platform.c
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/arm/fdt: arm_platform.c
src/sys/arch/arm/nvidia: tegra_platform.c
src/sys/arch/arm/nxp: imx6_platform.c
src/sys/arch/arm/rockchip: rk_platform.c
src/sys/arch/arm/samsung: exynos_platform.c
src/sys/arch/arm/sunxi: sunxi_platform.c
src/sys/arch/arm/ti: omap3_platform.c
src/sys/arch/arm/vexpress: vexpress_platform.c
src/sys/arch/arm/virt: virt_platform.c
src/sys/arch/arm/xilinx: zynq_platform.c
Log Message:
Call acpi_device_register() / fdtbus_device_register() as approrpriate.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/acpi/acpi_platform.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/altera/cycv_platform.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/fdt/arm_platform.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/omap3_platform.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xilinx/zynq_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/acpi/acpi_platform.c
diff -u src/sys/arch/arm/acpi/acpi_platform.c:1.22 src/sys/arch/arm/acpi/acpi_platform.c:1.23
--- src/sys/arch/arm/acpi/acpi_platform.c:1.22 Sun Dec 6 14:01:40 2020
+++ src/sys/arch/arm/acpi/acpi_platform.c Thu Feb 4 22:36:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.22 2020/12/06 14:01:40 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.23 2021/02/04 22:36:52 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.22 2020/12/06 14:01:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.23 2021/02/04 22:36:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -279,6 +279,10 @@ acpi_platform_init_attach_args(struct fd
static void
acpi_platform_device_register(device_t self, void *aux)
{
+ /* XXX Not ideal, but the only reasonable solution atm. */
+ acpi_device_register(self, aux);
+ fdtbus_device_register(self, aux);
+
#if NCOM > 0
prop_dictionary_t prop = device_properties(self);
ACPI_STATUS rv;
Index: src/sys/arch/arm/altera/cycv_platform.c
diff -u src/sys/arch/arm/altera/cycv_platform.c:1.16 src/sys/arch/arm/altera/cycv_platform.c:1.17
--- src/sys/arch/arm/altera/cycv_platform.c:1.16 Fri Jan 29 13:10:07 2021
+++ src/sys/arch/arm/altera/cycv_platform.c Thu Feb 4 22:36:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_platform.c,v 1.16 2021/01/29 13:10:07 rin Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.17 2021/02/04 22:36:52 thorpej Exp $ */
/* This file is in the public domain. */
@@ -7,7 +7,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.16 2021/01/29 13:10:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.17 2021/02/04 22:36:52 thorpej Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -137,9 +137,12 @@ cycv_platform_init_attach_args(struct fd
}
static void
-cycv_platform_device_register(device_t dev, void *aux) {
+cycv_platform_device_register(device_t dev, void *aux)
+{
prop_dictionary_t dict = device_properties(dev);
+ fdtbus_device_register(dev, aux);
+
if (device_is_a(dev, "arma9tmr")) {
prop_dictionary_set_uint32(dict, "frequency",
cycv_clkmgr_early_get_mpu_clk() / 4);
Index: src/sys/arch/arm/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.17 src/sys/arch/arm/amlogic/meson_platform.c:1.18
--- src/sys/arch/arm/amlogic/meson_platform.c:1.17 Fri Jan 29 13:10:07 2021
+++ src/sys/arch/arm/amlogic/meson_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.17 2021/01/29 13:10:07 rin Exp $ */
+/* $NetBSD: meson_platform.c,v 1.18 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.17 2021/01/29 13:10:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.18 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -182,6 +182,8 @@ meson_platform_device_register(device_t
{
prop_dictionary_t dict = device_properties(self);
+ fdtbus_device_register(self, aux);
+
if (device_is_a(self, "awge") && device_unit(self) == 0) {
uint8_t enaddr[ETHER_ADDR_LEN];
if (get_bootconf_option(boot_args, "awge0.mac-address",
@@ -232,6 +234,8 @@ meson8b_platform_device_register(device_
device_t parent = device_parent(self);
char *ptr;
+ fdtbus_device_register(dev, aux);
+
if (device_is_a(self, "ld") &&
device_is_a(parent, "sdmmc") &&
(device_is_a(device_parent(parent), "mesonsdhc") ||
Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.46 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.47
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.46 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.46 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.47 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.46 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.47 2021/02/04 22:36:53 thorpej Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1422,6 +1422,8 @@ bcm283x_platform_device_register(device_
{
prop_dictionary_t dict = device_properties(dev);
+ fdtbus_device_register(dev, aux);
+
if (device_is_a(dev, "bcmdmac") &&
vcprop_tag_success_p(&vb.vbt_dmachan.tag)) {
prop_dictionary_set_uint32(dict,
Index: src/sys/arch/arm/fdt/arm_platform.c
diff -u src/sys/arch/arm/fdt/arm_platform.c:1.3 src/sys/arch/arm/fdt/arm_platform.c:1.4
--- src/sys/arch/arm/fdt/arm_platform.c:1.3 Mon Sep 28 11:54:23 2020
+++ src/sys/arch/arm/fdt/arm_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: arm_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,6 +75,7 @@ arm_platform_init_attach_args(struct fdt
static void
arm_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(self, aux);
}
static const struct pmap_devmap *
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.25 src/sys/arch/arm/nvidia/tegra_platform.c:1.26
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.25 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/nvidia/tegra_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.25 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.26 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -34,7 +34,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.25 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.26 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -151,6 +151,8 @@ tegra_platform_device_register(device_t
{
prop_dictionary_t dict = device_properties(self);
+ fdtbus_device_register(self, aux);
+
if (device_is_a(self, "tegrafb") &&
match_bootconf_option(boot_args, "console", "fb")) {
prop_dictionary_set_bool(dict, "is_console", true);
Index: src/sys/arch/arm/nxp/imx6_platform.c
diff -u src/sys/arch/arm/nxp/imx6_platform.c:1.3 src/sys/arch/arm/nxp/imx6_platform.c:1.4
--- src/sys/arch/arm/nxp/imx6_platform.c:1.3 Fri Jan 29 13:10:07 2021
+++ src/sys/arch/arm/nxp/imx6_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_platform.c,v 1.3 2021/01/29 13:10:07 rin Exp $ */
+/* $NetBSD: imx6_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.3 2021/01/29 13:10:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $");
#include "arml2cc.h"
#include "opt_console.h"
@@ -119,6 +119,8 @@ imx_platform_device_register(device_t se
{
prop_dictionary_t prop = device_properties(self);
+ fdtbus_device_register(dev, aux);
+
if (device_is_a(self, "atphy")) {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6dl-sabresd" },
Index: src/sys/arch/arm/rockchip/rk_platform.c
diff -u src/sys/arch/arm/rockchip/rk_platform.c:1.10 src/sys/arch/arm/rockchip/rk_platform.c:1.11
--- src/sys/arch/arm/rockchip/rk_platform.c:1.10 Mon Sep 28 11:54:23 2020
+++ src/sys/arch/arm/rockchip/rk_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.10 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: rk_platform.c,v 1.11 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.10 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.11 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -70,6 +70,7 @@ rk_platform_init_attach_args(struct fdt_
static void
rk_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(self, aux);
}
static void
Index: src/sys/arch/arm/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.36 src/sys/arch/arm/samsung/exynos_platform.c:1.37
--- src/sys/arch/arm/samsung/exynos_platform.c:1.36 Wed Jan 27 03:16:37 2021
+++ src/sys/arch/arm/samsung/exynos_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.36 2021/01/27 03:16:37 thorpej Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.37 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.36 2021/01/27 03:16:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.37 2021/02/04 22:36:53 thorpej Exp $");
/*
@@ -248,6 +248,7 @@ exynos_platform_early_putchar(char c)
static void
exynos_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(self, aux);
exynos_device_register(self, aux);
}
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.41 src/sys/arch/arm/sunxi/sunxi_platform.c:1.42
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.41 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.41 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.42 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.41 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.42 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -202,6 +202,8 @@ sunxi_platform_device_register(device_t
prop_dictionary_t prop = device_properties(self);
int val;
+ fdtbus_device_register(self, aux);
+
if (device_is_a(self, "rgephy")) {
/* Pine64+ and NanoPi NEO Plus2 gigabit ethernet workaround */
static const struct device_compatible_entry compat_data[] = {
Index: src/sys/arch/arm/ti/omap3_platform.c
diff -u src/sys/arch/arm/ti/omap3_platform.c:1.4 src/sys/arch/arm/ti/omap3_platform.c:1.5
--- src/sys/arch/arm/ti/omap3_platform.c:1.4 Mon Sep 28 11:54:23 2020
+++ src/sys/arch/arm/ti/omap3_platform.c Thu Feb 4 22:36:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_platform.c,v 1.4 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.5 2021/02/04 22:36:53 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.4 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.5 2021/02/04 22:36:53 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,6 +146,7 @@ omap3_platform_early_putchar(char c)
static void
omap3_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(dev, aux);
}
static u_int
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.19 src/sys/arch/arm/vexpress/vexpress_platform.c:1.20
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.19 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Thu Feb 4 22:36:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.19 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.20 2021/02/04 22:36:54 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.19 2020/10/30 18:54:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.20 2021/02/04 22:36:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -195,6 +195,7 @@ vexpress_platform_init_attach_args(struc
static void
vexpress_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(dev, aux);
}
static void
Index: src/sys/arch/arm/virt/virt_platform.c
diff -u src/sys/arch/arm/virt/virt_platform.c:1.12 src/sys/arch/arm/virt/virt_platform.c:1.13
--- src/sys/arch/arm/virt/virt_platform.c:1.12 Fri Oct 30 18:54:37 2020
+++ src/sys/arch/arm/virt/virt_platform.c Thu Feb 4 22:36:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virt_platform.c,v 1.12 2020/10/30 18:54:37 skrll Exp $ */
+/* $NetBSD: virt_platform.c,v 1.13 2021/02/04 22:36:54 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.12 2020/10/30 18:54:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.13 2021/02/04 22:36:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -107,6 +107,7 @@ virt_platform_init_attach_args(struct fd
static void
virt_platform_device_register(device_t self, void *aux)
{
+ fdtbus_device_register(self, aux);
}
static u_int
Index: src/sys/arch/arm/xilinx/zynq_platform.c
diff -u src/sys/arch/arm/xilinx/zynq_platform.c:1.3 src/sys/arch/arm/xilinx/zynq_platform.c:1.4
--- src/sys/arch/arm/xilinx/zynq_platform.c:1.3 Mon Sep 28 11:54:24 2020
+++ src/sys/arch/arm/xilinx/zynq_platform.c Thu Feb 4 22:36:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_platform.c,v 1.3 2020/09/28 11:54:24 jmcneill Exp $ */
+/* $NetBSD: zynq_platform.c,v 1.4 2021/02/04 22:36:54 thorpej Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.3 2020/09/28 11:54:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.4 2021/02/04 22:36:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,6 +129,8 @@ zynq_platform_device_register(device_t d
{
prop_dictionary_t dict = device_properties(dev);
+ fdtbus_device_register(dev, aux);
+
if (device_is_a(dev, "arma9tmr")) {
prop_dictionary_set_uint32(dict, "frequency",
ZYNQ_REF_FREQ / 4);
