Module Name: src
Committed By: thorpej
Date: Sat Apr 3 21:21:08 UTC 2021
Modified Files:
src/sys/arch/arm/acpi [thorpej-cfargs]: acpi_platform.c
src/sys/arch/arm/altera [thorpej-cfargs]: cycv_platform.c
src/sys/arch/arm/amlogic [thorpej-cfargs]: meson_platform.c
src/sys/arch/arm/broadcom [thorpej-cfargs]: bcm283x_platform.c
src/sys/arch/arm/fdt [thorpej-cfargs]: arm_platform.c
src/sys/arch/arm/nvidia [thorpej-cfargs]: tegra_platform.c
src/sys/arch/arm/nxp [thorpej-cfargs]: imx6_platform.c
src/sys/arch/arm/rockchip [thorpej-cfargs]: rk_platform.c
src/sys/arch/arm/samsung [thorpej-cfargs]: exynos_platform.c
src/sys/arch/arm/sunxi [thorpej-cfargs]: sunxi_platform.c
src/sys/arch/arm/ti [thorpej-cfargs]: omap3_platform.c
src/sys/arch/arm/vexpress [thorpej-cfargs]: vexpress_platform.c
src/sys/arch/arm/virt [thorpej-cfargs]: virt_platform.c
src/sys/arch/arm/xilinx [thorpej-cfargs]: zynq_platform.c
src/sys/dev/fdt [thorpej-cfargs]: fdtbus.c fdtvar.h
src/sys/dev/ofw [thorpej-cfargs]: ofw_subr.c openfirm.h
Log Message:
- FDT device enumeration now sets the device handle using CFARG_DEVHANDLE.
- fdtbus_device_register() is now obsolete, so G/C it.
- of_device_register() is now obsolete, so G/C it.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/arch/arm/acpi/acpi_platform.c
cvs rdiff -u -r1.17 -r1.17.2.1 src/sys/arch/arm/altera/cycv_platform.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/arm/fdt/arm_platform.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/ti/omap3_platform.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/arm/xilinx/zynq_platform.c
cvs rdiff -u -r1.40.2.3 -r1.40.2.4 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/dev/ofw/ofw_subr.c
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/dev/ofw/openfirm.h
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.24 src/sys/arch/arm/acpi/acpi_platform.c:1.24.2.1
--- src/sys/arch/arm/acpi/acpi_platform.c:1.24 Fri Feb 12 12:26:09 2021
+++ src/sys/arch/arm/acpi/acpi_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.24 2021/02/12 12:26:09 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.24.2.1 2021/04/03 21:21:07 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.24 2021/02/12 12:26:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.24.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -287,9 +287,7 @@ 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);
Index: src/sys/arch/arm/altera/cycv_platform.c
diff -u src/sys/arch/arm/altera/cycv_platform.c:1.17 src/sys/arch/arm/altera/cycv_platform.c:1.17.2.1
--- src/sys/arch/arm/altera/cycv_platform.c:1.17 Thu Feb 4 22:36:52 2021
+++ src/sys/arch/arm/altera/cycv_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_platform.c,v 1.17 2021/02/04 22:36:52 thorpej Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.17.2.1 2021/04/03 21:21:07 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.17 2021/02/04 22:36:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.17.2.1 2021/04/03 21:21:07 thorpej Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -141,8 +141,6 @@ cycv_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",
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.19 src/sys/arch/arm/amlogic/meson_platform.c:1.19.2.1
--- src/sys/arch/arm/amlogic/meson_platform.c:1.19 Fri Feb 5 08:07:14 2021
+++ src/sys/arch/arm/amlogic/meson_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $ */
+/* $NetBSD: meson_platform.c,v 1.19.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.19.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -182,8 +182,6 @@ 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",
@@ -234,8 +232,6 @@ meson8b_platform_device_register(device_
device_t parent = device_parent(self);
char *ptr;
- fdtbus_device_register(self, 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.47 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.47.2.1
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.47 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.47 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.47.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.47 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.47.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1422,8 +1422,6 @@ 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.4 src/sys/arch/arm/fdt/arm_platform.c:1.4.2.1
--- src/sys/arch/arm/fdt/arm_platform.c:1.4 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/fdt/arm_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: arm_platform.c,v 1.4.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.4.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,7 +75,6 @@ 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.26 src/sys/arch/arm/nvidia/tegra_platform.c:1.26.2.1
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.26 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/nvidia/tegra_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.26 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.26.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -34,7 +34,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.26 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.26.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -151,8 +151,6 @@ 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.5 src/sys/arch/arm/nxp/imx6_platform.c:1.5.2.1
--- src/sys/arch/arm/nxp/imx6_platform.c:1.5 Fri Feb 5 08:07:14 2021
+++ src/sys/arch/arm/nxp/imx6_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_platform.c,v 1.5 2021/02/05 08:07:14 skrll Exp $ */
+/* $NetBSD: imx6_platform.c,v 1.5.2.1 2021/04/03 21:21:07 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.5 2021/02/05 08:07:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.5.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include "arml2cc.h"
#include "opt_console.h"
@@ -119,8 +119,6 @@ imx_platform_device_register(device_t se
{
prop_dictionary_t prop = device_properties(self);
- fdtbus_device_register(self, 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.11 src/sys/arch/arm/rockchip/rk_platform.c:1.11.2.1
--- src/sys/arch/arm/rockchip/rk_platform.c:1.11 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/rockchip/rk_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.11 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: rk_platform.c,v 1.11.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.11 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.11.2.1 2021/04/03 21:21:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -70,7 +70,6 @@ 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.37 src/sys/arch/arm/samsung/exynos_platform.c:1.37.2.1
--- src/sys/arch/arm/samsung/exynos_platform.c:1.37 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/samsung/exynos_platform.c Sat Apr 3 21:21:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.37 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.37.2.1 2021/04/03 21:21:07 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -35,7 +35,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.37 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.37.2.1 2021/04/03 21:21:07 thorpej Exp $");
/*
@@ -248,7 +248,6 @@ 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.42 src/sys/arch/arm/sunxi/sunxi_platform.c:1.42.2.1
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.42 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.42 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.42.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.42 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.42.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -202,8 +202,6 @@ 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.6 src/sys/arch/arm/ti/omap3_platform.c:1.6.2.1
--- src/sys/arch/arm/ti/omap3_platform.c:1.6 Fri Feb 5 08:07:14 2021
+++ src/sys/arch/arm/ti/omap3_platform.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_platform.c,v 1.6 2021/02/05 08:07:14 skrll Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.6.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.6 2021/02/05 08:07:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.6.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,7 +146,6 @@ omap3_platform_early_putchar(char c)
static void
omap3_platform_device_register(device_t self, void *aux)
{
- fdtbus_device_register(self, aux);
}
static u_int
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.21 src/sys/arch/arm/vexpress/vexpress_platform.c:1.21.2.1
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.21 Fri Feb 5 08:07:14 2021
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.21 2021/02/05 08:07:14 skrll Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.21.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.21 2021/02/05 08:07:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.21.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -195,7 +195,6 @@ vexpress_platform_init_attach_args(struc
static void
vexpress_platform_device_register(device_t self, void *aux)
{
- fdtbus_device_register(self, aux);
}
static void
Index: src/sys/arch/arm/virt/virt_platform.c
diff -u src/sys/arch/arm/virt/virt_platform.c:1.13 src/sys/arch/arm/virt/virt_platform.c:1.13.2.1
--- src/sys/arch/arm/virt/virt_platform.c:1.13 Thu Feb 4 22:36:54 2021
+++ src/sys/arch/arm/virt/virt_platform.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virt_platform.c,v 1.13 2021/02/04 22:36:54 thorpej Exp $ */
+/* $NetBSD: virt_platform.c,v 1.13.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.13 2021/02/04 22:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.13.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -107,7 +107,6 @@ 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.4 src/sys/arch/arm/xilinx/zynq_platform.c:1.4.2.1
--- src/sys/arch/arm/xilinx/zynq_platform.c:1.4 Thu Feb 4 22:36:54 2021
+++ src/sys/arch/arm/xilinx/zynq_platform.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_platform.c,v 1.4 2021/02/04 22:36:54 thorpej Exp $ */
+/* $NetBSD: zynq_platform.c,v 1.4.2.1 2021/04/03 21:21:08 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.4 2021/02/04 22:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.4.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,8 +129,6 @@ 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);
Index: src/sys/dev/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.40.2.3 src/sys/dev/fdt/fdtbus.c:1.40.2.4
--- src/sys/dev/fdt/fdtbus.c:1.40.2.3 Sat Apr 3 06:54:29 2021
+++ src/sys/dev/fdt/fdtbus.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.40.2.3 2021/04/03 06:54:29 thorpej Exp $ */
+/* $NetBSD: fdtbus.c,v 1.40.2.4 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.40.2.3 2021/04/03 06:54:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.40.2.4 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -396,17 +396,19 @@ fdt_scan(struct fdt_softc *sc, int pass)
node->n_dev = config_attach(node->n_bus, node->n_cf,
&faa, fdtbus_print,
CFARG_LOCATORS, locs,
+ CFARG_DEVHANDLE, devhandle_from_of(node->n_phandle),
CFARG_EOL);
} else {
/*
* Default pass.
*/
- node->n_dev =
- config_found(node->n_bus, &faa, fdtbus_print,
- CFARG_SUBMATCH, fdt_scan_submatch,
- CFARG_IATTR, "fdt",
- CFARG_LOCATORS, locs,
- CFARG_EOL);
+ node->n_dev = config_found(node->n_bus, &faa,
+ fdtbus_print,
+ CFARG_SUBMATCH, fdt_scan_submatch,
+ CFARG_IATTR, "fdt",
+ CFARG_LOCATORS, locs,
+ CFARG_DEVHANDLE, devhandle_from_of(node->n_phandle),
+ CFARG_EOL);
}
if (node->n_dev != NULL)
@@ -560,20 +562,3 @@ fdtbus_print(void *aux, const char *pnp)
return UNCONF;
}
-
-void
-fdtbus_device_register(device_t dev, void *aux)
-{
- /* All we do here is set the devhandle in the device_t. */
- int phandle = -1;
-
- if (device_attached_to_iattr(dev, "fdt")) {
- const struct fdt_attach_args *faa = aux;
- phandle = faa->faa_phandle;
- } else {
- return;
- }
- KASSERT(phandle != -1);
-
- of_device_register(dev, phandle);
-}
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.69 src/sys/dev/fdt/fdtvar.h:1.69.2.1
--- src/sys/dev/fdt/fdtvar.h:1.69 Thu Feb 4 22:14:08 2021
+++ src/sys/dev/fdt/fdtvar.h Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.69 2021/02/04 22:14:08 thorpej Exp $ */
+/* $NetBSD: fdtvar.h,v 1.69.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -436,7 +436,6 @@ void fdt_remove_bycompat(const char *[]
int fdt_find_with_property(const char *, int *);
int fdtbus_print(void *, const char *);
-void fdtbus_device_register(device_t, void *);
bus_dma_tag_t fdtbus_dma_tag_create(int, const struct fdt_dma_range *,
u_int);
Index: src/sys/dev/ofw/ofw_subr.c
diff -u src/sys/dev/ofw/ofw_subr.c:1.57 src/sys/dev/ofw/ofw_subr.c:1.57.2.1
--- src/sys/dev/ofw/ofw_subr.c:1.57 Fri Feb 5 17:17:59 2021
+++ src/sys/dev/ofw/ofw_subr.c Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_subr.c,v 1.57 2021/02/05 17:17:59 thorpej Exp $ */
+/* $NetBSD: ofw_subr.c,v 1.57.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.57 2021/02/05 17:17:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.57.2.1 2021/04/03 21:21:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -517,14 +517,6 @@ of_get_mode_string(char *buffer, int len
return buffer;
}
-void
-of_device_register(device_t dev, int phandle)
-{
-
- /* All we do here is set the devhandle in the device_t. */
- device_set_handle(dev, devhandle_from_of(phandle));
-}
-
/*
* of_device_from_phandle --
*
Index: src/sys/dev/ofw/openfirm.h
diff -u src/sys/dev/ofw/openfirm.h:1.46 src/sys/dev/ofw/openfirm.h:1.46.2.1
--- src/sys/dev/ofw/openfirm.h:1.46 Sat Feb 6 16:07:13 2021
+++ src/sys/dev/ofw/openfirm.h Sat Apr 3 21:21:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.h,v 1.46 2021/02/06 16:07:13 thorpej Exp $ */
+/* $NetBSD: openfirm.h,v 1.46.2.1 2021/04/03 21:21:08 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -124,7 +124,6 @@ int of_find_bycompat(int, const char *);
int of_getnode_byname(int, const char *);
bool of_to_uint32_prop(prop_dictionary_t, int, const char *, const char *);
bool of_to_dataprop(prop_dictionary_t, int, const char *, const char *);
-void of_device_register(device_t, int);
device_t of_device_from_phandle(int);
int *of_network_decode_media(int, int *, int *);
