 @@ -1,14 +1,14 @@
-/* $NetBSD: fdtbus.c,v 1.35 2020/09/20 11:25:36 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.36 2021/01/26 14:55:34 thorpej Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. 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: fdtbus.c,v 1.35 2020/09/20 11:25:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.36 2021/01/26 14:55:34 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/cpu.h>
 #include <sys/bus.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/fdt/fdtvar.h>
 @@ -77,41 +77,43 @@ struct fdt_softc {
 static int	fdt_match(device_t, cfdata_t, void *);
 static void	fdt_attach(device_t, device_t, void *);
 static int	fdt_rescan(device_t, const char *, const int *);
 static void	fdt_childdet(device_t, device_t);
 static int	fdt_scan_submatch(device_t, cfdata_t, const int *, void *);
 static void	fdt_scan_best(struct fdt_softc *, struct fdt_node *);
 static void	fdt_scan(struct fdt_softc *, int);
 static void	fdt_add_node(struct fdt_node *);
 static u_int	fdt_get_order(int);
 static void	fdt_pre_attach(struct fdt_node *);
 static void	fdt_post_attach(struct fdt_node *);
-static const char * const fdtbus_compatible[] =
+static const struct device_compatible_entry compat_data[] = {
-    { "simple-bus", NULL };
+	{ .compat = "simple-bus" },
 	{ }
 };
 CFATTACH_DECL2_NEW(simplebus, sizeof(struct fdt_softc),
     fdt_match, fdt_attach, NULL, NULL, fdt_rescan, fdt_childdet);
 static int
 fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const struct fdt_attach_args *faa = aux;
 	const int phandle = faa->faa_phandle;
 	int match;
 	/* Check compatible string */
-	match = of_match_compatible(phandle, fdtbus_compatible);
+	match = of_match_compat_data(phandle, compat_data);
 	if (match)
 		return match;
 	/* Some nodes have no compatible string */
 	if (!of_hasprop(phandle, "compatible")) {
 		if (OF_finddevice("/clocks") == phandle)
 			return 1;
 		if (OF_finddevice("/chosen") == phandle)
 			return 1;
+	}
 	/* Always match the root node */
 	return OF_finddevice("/") == phandle;
 @@ -464,27 +466,27 @@ fdt_remove_byhandle(int phandle)
 		if (node->n_phandle == phandle) {
 			TAILQ_REMOVE(&fdt_nodes, node, n_nodes);
 			return;
+		}
+	}
+}
 void
 fdt_remove_bycompat(const char *compatible[])
+{
 	struct fdt_node *node, *next;
 	TAILQ_FOREACH_SAFE(node, &fdt_nodes, n_nodes, next) {
-		if (of_match_compatible(node->n_phandle, compatible)) {
+		if (of_compatible(node->n_phandle, compatible)) {
 			TAILQ_REMOVE(&fdt_nodes, node, n_nodes);
+		}
+	}
+}
 int
 fdt_find_with_property(const char *prop, int *pindex)
+{
 	struct fdt_node *node;
 	int index = 0;
 	TAILQ_FOREACH(node, &fdt_nodes, n_nodes) {
 		if (index++ < *pindex)