 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $ */
+/* $NetBSD: tegra_drm.c,v 1.15 2022/02/23 07:55:56 skrll 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: tegra_drm.c,v 1.14 2021/12/19 12:44:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm.c,v 1.15 2022/02/23 07:55:56 skrll 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/conf.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_device.h>
 #include <drm/drm_drv.h>
 @@ -160,27 +160,27 @@ tegra_drm_attach(device_t parent, device
 		} else if (of_compatible_match(node, dc_compat) &&
 			   ndc < __arraycount(sc->sc_clk_dc)) {
 			sc->sc_clk_dc[ndc] = fdtbus_clock_get(node, "dc");
 			sc->sc_clk_dc_parent[ndc] = fdtbus_clock_get(node,
 			    "parent");
 			sc->sc_rst_dc[ndc] = fdtbus_reset_get(node, "dc");
 			++ndc;
+		}
+	}
 	if (hdmi_phandle >= 0) {
 		ddc_phandle = fdtbus_get_phandle(hdmi_phandle,
 		    "nvidia,ddc-i2c-bus");
 		if (ddc_phandle >= 0) {
-			sc->sc_ddc = fdtbus_get_i2c_tag(ddc_phandle);
+			sc->sc_ddc = fdtbus_i2c_get_tag(ddc_phandle);
+		}
 		sc->sc_pin_hpd = fdtbus_gpio_acquire(hdmi_phandle,
 		    "nvidia,hpd-gpio", GPIO_PIN_INPUT);
 		for (n = 0; n < __arraycount(hdmi_supplies); n++) {
 			const char *supply = hdmi_supplies[n];
 			reg = fdtbus_regulator_acquire(hdmi_phandle, supply);
 			if (reg == NULL) {
 				aprint_error_dev(self, "couldn't acquire %s\n",
 				    supply);
 				continue;
+			}

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_i2c.c,v 1.11 2021/08/07 16:19:10 thorpej Exp $ */
+/* $NetBSD: fdt_i2c.c,v 1.12 2022/02/23 07:55:55 skrll 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: fdt_i2c.c,v 1.11 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_i2c.c,v 1.12 2022/02/23 07:55:55 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/queue.h>
 #include <libfdt.h>
 #include <dev/fdt/fdtvar.h>
 struct fdtbus_i2c_controller {
 	i2c_tag_t i2c_tag;
 	int i2c_phandle;
 @@ -65,47 +65,47 @@ static struct fdtbus_i2c_controller *
 fdtbus_get_i2c_controller(int phandle)
+{
 	struct fdtbus_i2c_controller *i2c;
 	LIST_FOREACH(i2c, &fdtbus_i2c_controllers, i2c_next) {
 		if (i2c->i2c_phandle == phandle)
 			return i2c;
+	}
 	return NULL;
+}
 i2c_tag_t
-fdtbus_get_i2c_tag(int phandle)
+fdtbus_i2c_get_tag(int phandle)
+{
 	struct fdtbus_i2c_controller *i2c;
 	i2c = fdtbus_get_i2c_controller(phandle);
 	if (i2c == NULL)
 		return NULL;
 	return i2c->i2c_tag;
+}
 i2c_tag_t
 fdtbus_i2c_acquire(int phandle, const char *prop)
+{
 	int i2c_phandle;
 	i2c_phandle = fdtbus_get_phandle(phandle, prop);
 	if (i2c_phandle == -1)
 		return NULL;
-	return fdtbus_get_i2c_tag(i2c_phandle);
+	return fdtbus_i2c_get_tag(i2c_phandle);
+}
 device_t
 fdtbus_attach_i2cbus(device_t dev, int phandle, i2c_tag_t tag, cfprint_t print)
+{
 	struct i2cbus_attach_args iba;
 	prop_dictionary_t devs, props;
 	device_t ret;
 	u_int address_cells;
 	devs = prop_dictionary_create();
 	if (of_getprop_uint32(phandle, "#address-cells", &address_cells))
 		address_cells = 1;

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdtvar.h,v 1.74 2022/01/14 07:40:52 skrll Exp $ */
+/* $NetBSD: fdtvar.h,v 1.75 2022/02/23 07:55:55 skrll 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.
 @@ -312,27 +312,27 @@ void		fdtbus_set_decoderegprop(bool);
 int		fdtbus_get_reg(int, u_int, bus_addr_t *, bus_size_t *);
 int		fdtbus_get_reg_byname(int, const char *, bus_addr_t *,
 		    bus_size_t *);
 int		fdtbus_get_reg64(int, u_int, uint64_t *, uint64_t *);
 int		fdtbus_get_addr_cells(int);
 int		fdtbus_get_size_cells(int);
 uint64_t	fdtbus_get_cells(const uint8_t *, int);
 int		fdtbus_get_phandle(int, const char *);
 int		fdtbus_get_phandle_with_data(int, const char *, const char *,
 		    int, struct fdt_phandle_data *);
 int		fdtbus_get_phandle_from_native(int);
-i2c_tag_t	fdtbus_get_i2c_tag(int);
+i2c_tag_t	fdtbus_i2c_get_tag(int);
 i2c_tag_t	fdtbus_i2c_acquire(int, const char *);
 void *		fdtbus_intr_establish(int, u_int, int, int,
 		    int (*func)(void *), void *arg);
 void *		fdtbus_intr_establish_xname(int, u_int, int, int,
 		    int (*func)(void *), void *arg, const char *);
 void *		fdtbus_intr_establish_byname(int, const char *, int, int,
 		    int (*func)(void *), void *arg, const char *);
 void *		fdtbus_intr_establish_raw(int, const u_int *, int, int,
 		    int (*func)(void *), void *arg, const char *);
 void		fdtbus_intr_mask(int, void *);
 void		fdtbus_intr_unmask(int, void *);
 void		fdtbus_intr_disestablish(int, void *);