Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/sunxi/sunxi_thermal.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/sunxi/sunxi_thermal.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8
retrieving revision 1.8.8.1
diff -u -p -r1.8 -r1.8.8.1
--- src/sys/arch/arm/sunxi/sunxi_thermal.c	2020/01/01 22:57:16	1.8
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c	2021/04/03 22:28:19	1.8.8.1
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.8 2020/01/01 22:57:16 thorpej Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.8.8.1 2021/04/03 22:28:19 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.8 2020/01/01 22:57:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.8.8.1 2021/04/03 22:28:19 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -305,12 +305,12 @@ static const struct sunxi_thermal_config
 	.to_reg = h5_to_reg,
 };
 
-static struct of_compat_data compat_data[] = {
-	{ "allwinner,sun8i-a83t-ts",	(uintptr_t)&a83t_config },
-	{ "allwinner,sun8i-h3-ts",	(uintptr_t)&h3_config },
-	{ "allwinner,sun50i-a64-ts",	(uintptr_t)&a64_config },
-	{ "allwinner,sun50i-h5-ts",	(uintptr_t)&h5_config },
-	{ NULL,				(uintptr_t)NULL }
+static struct device_compatible_entry compat_data[] = {
+	{ .compat = "allwinner,sun8i-a83t-ts",	.data = &a83t_config },
+	{ .compat = "allwinner,sun8i-h3-ts",	.data = &h3_config },
+	{ .compat = "allwinner,sun50i-a64-ts",	.data = &a64_config },
+	{ .compat = "allwinner,sun50i-h5-ts",	.data = &h5_config },
+	DEVICE_COMPAT_EOL
 };
 
 struct sunxi_thermal_softc {
@@ -318,7 +318,7 @@ struct sunxi_thermal_softc {
 	int				phandle;
 	bus_space_tag_t			bst;
 	bus_space_handle_t		bsh;
-	struct sunxi_thermal_config	*conf;
+	const struct sunxi_thermal_config *conf;
 
 	kmutex_t			lock;
 	callout_t			tick;
@@ -544,7 +544,7 @@ sunxi_thermal_match(device_t parent, cfd
 {
 	struct fdt_attach_args * const faa = aux;
 
-	return of_match_compat_data(faa->faa_phandle, compat_data);
+	return of_compatible_match(faa->faa_phandle, compat_data);
 }
 
 static void
@@ -567,7 +567,7 @@ sunxi_thermal_attach(device_t parent, de
 	sc->dev = self;
 	sc->phandle = phandle;
 	sc->bst = faa->faa_bst;
-	sc->conf = (void *)of_search_compatible(phandle, compat_data)->data;
+	sc->conf = of_compatible_lookup(phandle, compat_data)->data;
 	if (bus_space_map(sc->bst, addr, size, 0, &sc->bsh) != 0) {
 		aprint_error(": couldn't map registers\n");
 		return;
@@ -589,8 +589,8 @@ sunxi_thermal_attach(device_t parent, de
 	aprint_naive("\n");
 	aprint_normal(": Thermal sensor controller\n");
 
-	ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
-	    sunxi_thermal_intr, sc);
+	ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
+	    sunxi_thermal_intr, sc, device_xname(self));
 	if (ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt on %s\n",
 		    intrstr);