 @@ -1,22 +1,22 @@
-# $NetBSD: files.fdt,v 1.18 2018/06/30 16:22:56 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.19 2018/06/30 16:30:35 jmcneill Exp $
 include	"dev/pckbport/files.pckbport"
 device	armfdt { }: bus_space_generic, fdt
 attach	armfdt at root with arm_fdt
 file	arch/arm/fdt/arm_fdt.c			arm_fdt
-attach	cpu at cpus with cpu_fdt
+attach	cpu at fdt with cpu_fdt
 file	arch/arm/fdt/cpu_fdt.c			cpu_fdt
 device	cpufreqdt
 attach	cpufreqdt at cpu with cpufreq_dt
 file	dev/fdt/cpufreq_dt.c			cpufreq_dt
 device	a9tmr: mpcorebus
 attach	a9tmr at fdt with a9tmr_fdt
 file	arch/arm/fdt/a9tmr_fdt.c		a9tmr_fdt
 device	gtmr: mpcorebus
 attach	gtmr at fdt with gtmr_fdt
 file	arch/arm/fdt/gtmr_fdt.c			gtmr_fdt

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: EXYNOS,v 1.23 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: EXYNOS,v 1.24 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	Samsung Exynos SoC kernel
+#
 include	"arch/evbarm/conf/std.exynos"
 include	"arch/evbarm/conf/GENERIC.common"
 makeoptions 	DTS="
 	exynos5410-odroidxu.dts
 	exynos5410-smdk5410.dts
 	exynos5422-odroidxu3-lite.dts
 	exynos5422-odroidxu3.dts
 	exynos5422-odroidxu4.dts
 @@ -32,27 +32,27 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	SSCOM2CONSOLE
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 fclock*		at fdt? pass 4
 fregulator*	at fdt? pass 4
 gpiokeys*	at fdt?
 # Timer
 mct*		at fdt?			# Exynos Multi Core Timer (MCT)
 armgtmr0	at mct?			# ARM Generic Timer
 # Interrupt controller
 exyointr*	at fdt? pass 1
 gic*		at fdt? pass 1		# GIC
 armgic0		at gic?

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: GENERIC,v 1.2 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: GENERIC,v 1.3 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	GENERIC ARM (aarch32) kernel
+#
 include	"arch/evbarm/conf/std.generic"
 include "arch/evbarm/conf/files.generic"
 include	"arch/evbarm/conf/GENERIC.common"
+#
 # FDT files supported by this kernel - add to DTSSUBDIR and DTS as
 # appropriate
+#
 makeoptions 	DTSARCH="arm"
 @@ -48,27 +48,27 @@ options 	VERBOSE_INIT_ARM # verbose boot
 #options        EARLYCONS=tegra, CONSADDR=0x70006000
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 # CPU frequency scaling
 cpufreqdt*	at cpu?
 # Power State Coordination Interface (PSCI)
 psci*		at fdt?
 fclock*		at fdt? pass 1
 ffclock*	at fdt? pass 1
 fregulator*	at fdt? pass 4
 gregulator*	at fdt? pass 4
 gpiokeys*	at fdt?
 wskbd*		at gpiokeys? console ? mux 1

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: RPI64,v 1.2 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: RPI64,v 1.3 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	RPI64 - Raspberry Pi 3 and Pi 2 v1.2 in AARCH64 mode
+#
 include "arch/evbarm/conf/std.generic64"
 include "arch/evbarm/conf/GENERIC.common"
 include "arch/evbarm/conf/files.rpi"
 makeoptions DTSGNUARCH="arm arm64"
 makeoptions DTSSUBDIR="broadcom"
 makeoptions	DTS="
 	bcm2837-rpi-3-b.dts
 @@ -55,27 +55,27 @@ options 	LOCKDEBUG
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
 #options 		BOOT_ARGS="\"\""
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0 	at root
 simplebus*	at fdt?
 # The CPU(s)
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 gtmr*		at fdt? pass 1		# ARM Generic Timer
 armgtmr0	at gtmr?
 fclock* 	at fdt? pass 0
 # Interrupt Controller
 bcmicu* 	at fdt? pass 1
 # System timer
 #bcmtmr0 	at fdt? pass 1
 # Clock manager

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: GENERIC64,v 1.21 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: GENERIC64,v 1.22 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	GENERIC ARM (aarch64) kernel
+#
 include	"arch/evbarm/conf/std.generic64"
 include "arch/evbarm/conf/files.generic64"
 include	"arch/evbarm/conf/GENERIC.common"
+#
 # FDT files supported by this kernel - add to DTSSUBDIR and DTS as
 # appropriate
+#
 makeoptions 	DTSARCH="arm aarch64"
 @@ -74,27 +74,27 @@ options 	VERBOSE_INIT_ARM # verbose boot
 #options 	EARLYCONS=virt
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 # CPU frequency scaling
 cpufreqdt*	at cpu?
 # Power State Coordination Interface (PSCI)
 psci*		at fdt?
 fclock*		at fdt? pass 1
 ffclock*	at fdt? pass 1
 fregulator*	at fdt? pass 4
 gregulator*	at fdt? pass 4
 gpiokeys*	at fdt?
 wskbd*		at gpiokeys? console ? mux 1

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: RPI,v 1.79 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: RPI,v 1.80 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	RPi -- Raspberry Pi
+#
 include	"arch/evbarm/conf/std.rpi"
 include "arch/evbarm/conf/GENERIC.common"
 makeoptions DTSGNUARCH="arm arm64"
 makeoptions DTSSUBDIR="broadcom"
 makeoptions	DTS="
 	bcm2835-rpi-a.dts
 	bcm2835-rpi-a-plus.dts
 @@ -49,27 +49,27 @@ options 	PLCONSOLE
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
 #options		BOOT_ARGS="\"\""
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # The CPU(s)
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 fclock*		at fdt? pass 0
 # Interrupt Controller
 bcmicu*		at fdt? pass 1
 # System timer
 bcmtmr0		at fdt? pass 1
 # Clock manager
 bcmcprman0 	at fdt? pass 1
 # AUX

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: SUNXI,v 1.76 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: SUNXI,v 1.77 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	Allwinner sunxi family
+#
 include	"arch/evbarm/conf/std.sunxi"
 include	"arch/evbarm/conf/GENERIC.common"
 makeoptions	DTSGNUARCH="arm arm64"
 makeoptions	DTSSUBDIR="allwinner"
 makeoptions	DTS="
 	sun4i-a10-a1000.dts
 	sun4i-a10-ba10-tvbox.dts
 	sun4i-a10-chuwi-v7-cw0825.dts
 @@ -162,27 +162,27 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	CONSADDR=0x01c28000
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 cpufreqdt*	at cpu?
 # Power state coordination interface
 psci*		at fdt?
 # Clock and reset controllers
 sun4ia10ccu*	at fdt? pass 2		# A10/A20 CCU
 sun5ia13ccu*	at fdt? pass 2		# A13 CCU
 sun6ia31ccu*	at fdt? pass 2		# A31 CCU
 sun8ia83tccu*	at fdt? pass 2		# A83T CCU
 sun8ih3ccu*	at fdt? pass 2		# H3 CCU
 sun8ih3rccu*	at fdt? pass 2		# H3 CCU (PRCM)
 sun9ia80ccu*	at fdt? pass 2		# A80 CCU

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: TEGRA,v 1.34 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: TEGRA,v 1.35 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	NVIDIA Tegra family SoCs
+#
 include	"arch/evbarm/conf/std.tegra"
 include	"arch/evbarm/conf/GENERIC.common"
 makeoptions	DTSGNUARCH="arm arm64"
 makeoptions	DTSSUBDIR="nvidia"
 makeoptions	DTS="
 	tegra124-apalis-eval.dts
 	tegra124-jetson-tk1.dts
 	tegra124-nyan-big.dts
 @@ -40,27 +40,27 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	CONSADDR=0x70006300
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 # CPU frequency scaling
 tegra124cpu*	at cpu?
 fclock*		at fdt? pass 4
 fregulator*	at fdt? pass 5
 gpiokeys*	at fdt?
 wskbd*		at gpiokeys? console ? mux 1
 # Timer
 gtmr*		at fdt? pass 1		# ARM Generic Timer
 armgtmr0	at gtmr?
 tegratimer*	at fdt?			# Timers

 @@ -1,14 +1,14 @@
-#	$NetBSD: TI,v 1.3 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: TI,v 1.4 2018/06/30 16:30:35 jmcneill Exp $
+#
 include "arch/evbarm/conf/std.ti"
 include "arch/evbarm/conf/GENERIC.common"
 options VERBOSE_INIT_ARM
 options	CONSADDR=0x44e09000
 makeoptions     DTS="
 	am335x-bone.dts
 	am335x-boneblack.dts
 	am335x-boneblack-wireless.dts
 	am335x-bonegreen.dts
 @@ -22,27 +22,27 @@ makeoptions	COPY_SYMTAB=1
 #options		DEBUG
 options  	LOCKDEBUG
 options		CPU_CORTEXA8
 options 	OMAP_SYSTEM_CLOCK_FREQ="48000000UL"
 config		netbsd	root on ? type ?
 armfdt0	 	at root
 simplebus*	at fdt?
 cpus*           at fdt? pass 0
-cpu*            at cpus?
+cpu*            at fdt? pass 0
 am3prcm*	at fdt? pass 1
 com*		at fdt?
 omapintc* 	at fdt? pass 2
 omaptimer*	at fdt?
 fregulator*     at fdt?
 gpioleds*       at fdt?
 cpsw*		at fdt?
 ukphy*		at mii?

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: VEXPRESS_A15,v 1.20 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: VEXPRESS_A15,v 1.21 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	ARM Versatile Express A15
+#
 include	"arch/evbarm/conf/std.vexpress"
 include	"arch/evbarm/conf/GENERIC.common"
 makeoptions 	DTS="vexpress-v2p-ca15-tc1.dts"
 options 	CPU_CORTEXA15
 options 	MULTIPROCESSOR
 pseudo-device 	openfirm	# /dev/openfirm
 @@ -23,27 +23,27 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	CONSADDR=0x1c090000
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 fclock*		at fdt? pass 4
 fregulator*	at fdt? pass 4
 gpiokeys*	at fdt?
 # Timer
 gtmr*		at fdt? pass 1		# ARM Generic Timer
 armgtmr0	at gtmr?
 # Interrupt controller
 gic*		at fdt? pass 1		# GIC
 armgic0		at gic?

 @@ -1,15 +1,15 @@
+#
-#	$NetBSD: VIRT,v 1.4 2018/06/30 16:22:56 jmcneill Exp $
+#	$NetBSD: VIRT,v 1.5 2018/06/30 16:30:35 jmcneill Exp $
+#
 #	QEMU ARM 'virt' virtual machine
+#
 include	"arch/evbarm/conf/std.virt"
 include	"arch/evbarm/conf/GENERIC.common"
 options 	CPU_CORTEXA7
 options 	CPU_CORTEXA15
 options 	CPU_CORTEXA17
 options 	SOC_VIRT
 options 	MULTIPROCESSOR
 @@ -24,27 +24,27 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	CONSADDR=0x09000000
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
 config		netbsd		root on ? type ?
 # Device tree support
 armfdt0		at root
 simplebus*	at fdt?
 # CPUs
 cpus*		at fdt? pass 0
-cpu*		at cpus?
+cpu*		at fdt? pass 0
 fclock*		at fdt? pass 4
 fregulator*	at fdt? pass 4
 gpiokeys*	at fdt?
 wskbd*		at gpiokeys? console ? mux 1
 # Power state coordination interface
 psci*		at fdt?
 # Timer
 gtmr*		at fdt? pass 1		# ARM Generic Timer
 armgtmr0	at gtmr?

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpus.c,v 1.2 2017/06/02 00:01:00 jmcneill Exp $ */
+/* $NetBSD: cpus.c,v 1.3 2018/06/30 16:30:35 jmcneill Exp $ */
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpus.c,v 1.2 2017/06/02 00:01:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpus.c,v 1.3 2018/06/30 16:30:35 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <dev/fdt/fdtvar.h>
 static int	cpus_match(device_t, cfdata_t, void *);
 static void	cpus_attach(device_t, device_t, void *);
 @@ -47,32 +47,19 @@ CFATTACH_DECL_NEW(cpus, 0, cpus_match, c
 static int
 cpus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return OF_finddevice("/cpus") == faa->faa_phandle;
+}
 static void
 cpus_attach(device_t parent, device_t self, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	int child;
 	aprint_naive("\n");
 	aprint_normal("\n");
-	for (child = OF_child(phandle); child; child = OF_peer(child)) {
+	fdt_add_bus(self, phandle, faa);
 		if (!fdtbus_status_okay(child))
 			continue;
 		struct fdt_attach_args cfaa = *faa;
 		cfaa.faa_phandle = child;
 		cfaa.faa_name = "cpu";
 		cfaa.faa_quiet = 0;
 		device_t cpu = config_found(self, &cfaa, fdtbus_print);
 		if (cpu)
 			config_found(cpu, &cfaa, NULL);
+}