 @@ -1,14 +1,14 @@
-/* $NetBSD: rk3399_iomux.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk3399_iomux.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $ */
 /*-
  * Copyright (c) 2018 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.
 @@ -19,27 +19,27 @@
  * 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.
  */
 //#define RK3399_IOMUX_DEBUG
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk3399_iomux.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk3399_iomux.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/gpio.h>
 #include <sys/lwp.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/syscon.h>
 @@ -173,27 +173,27 @@ static const struct rk3399_iomux_bank rk
 struct rk3399_iomux_conf {
 	const struct rk3399_iomux_bank *banks;
 	u_int nbanks;
 };
 static const struct rk3399_iomux_conf rk3399_iomux_conf = {
 	.banks = rk3399_iomux_banks,
 	.nbanks = __arraycount(rk3399_iomux_banks),
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3399-pinctrl",	.data = &rk3399_iomux_conf },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct rk3399_iomux_softc {
 	device_t sc_dev;
 	struct syscon *sc_syscon[2];
 	const struct rk3399_iomux_conf *sc_conf;
 };
 #define	LOCK(syscon) 		\
 	syscon_lock(syscon)
 #define	UNLOCK(syscon)		\
 	syscon_unlock(syscon)

 @@ -1,14 +1,14 @@
-/* $NetBSD: rk_vop.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_vop.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $ */
 /*-
  * Copyright (c) 2019 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: rk_vop.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.9 2021/01/27 02:00:02 thorpej 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 <sys/sysctl.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 @@ -214,27 +214,27 @@ static const struct rk_vop_config rk3399
 static const struct rk_vop_config rk3399_vop_big_config = {
 	.descr = "RK3399 VOPB",
 	.out_mode = DSP_OUT_MODE_RGBaaa,
 	.init = rk3399_vop_init,
 	.set_polarity = rk3399_vop_set_polarity,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3399-vop-big",
 	  .data = &rk3399_vop_big_config },
 	{ .compat = "rockchip,rk3399-vop-lit",
 	  .data = &rk3399_vop_lit_config },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 rk_vop_mode_do_set_base(struct drm_crtc *crtc, struct drm_framebuffer *fb,
     int x, int y, int atomic)
+{
 	struct rk_vop_crtc *mixer_crtc = to_rk_vop_crtc(crtc);
 	struct rk_vop_softc * const sc = mixer_crtc->sc;
 	struct rk_drm_framebuffer *sfb = atomic?
 	    to_rk_drm_framebuffer(fb) :
 	    to_rk_drm_framebuffer(crtc->primary->fb);
 	uint64_t paddr = (uint64_t)sfb->obj->dmamap->dm_segs[0].ds_addr;

 @@ -1,14 +1,14 @@
-/* $NetBSD: rk_pwm.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_pwm.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $ */
 /*-
  * Copyright (c) 2019 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.
 @@ -18,27 +18,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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(1, "$NetBSD: rk_pwm.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk_pwm.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <dev/pwm/pwmvar.h>
 #include <dev/fdt/fdtvar.h>
 #define	PWM0_CNT		0x00
 @@ -55,27 +55,27 @@ __KERNEL_RCSID(1, "$NetBSD: rk_pwm.c,v 1
 #define	 CTRL_DUTY_POL		__BIT(3)
 #define	 CTRL_PWM_MODE		__BITS(2,1)
 #define	  CTRL_PWM_MODE_ONESHOT		0
 #define	  CTRL_PWM_MODE_CONTINUOUS	1
 #define	  CTRL_PWM_MODE_CAPTURE		2
 #define	 CTRL_PWM_EN		__BIT(0)
 enum rk_pwm_type {
 	PWM_RK3288 = 1,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3288-pwm",	.value = PWM_RK3288 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct rk_pwm_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh;
 	struct pwm_controller	sc_pwm;
 	struct pwm_config	sc_conf;
 	u_int			sc_clkfreq;
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rk_v1crypto.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: rk_v1crypto.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * rk_v1crypto -- Rockchip crypto v1 driver
+ *
  * This is just the RNG for now.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: rk_v1crypto.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk_v1crypto.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/mutex.h>
 #include <sys/rndsource.h>
 #include <sys/sysctl.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/rockchip/rk_v1crypto.h>
 @@ -90,27 +90,27 @@ RKC_CTRL(struct rk_v1crypto_softc *sc, u
+{
 	uint32_t c = 0;
 	c |= __SHIFTIN(m, RK_V1CRYPTO_CTRL_MASK);
 	c |= __SHIFTIN(v, m);
 	RKC_WRITE(sc, RK_V1CRYPTO_CTRL, c);
+}
 CFATTACH_DECL_NEW(rk_v1crypto, sizeof(struct rk_v1crypto_softc),
     rk_v1crypto_match, rk_v1crypto_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3288-crypto" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 rk_v1crypto_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const struct fdt_attach_args *const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 rk_v1crypto_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rk_tsadc.c,v 1.10 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: rk_tsadc.c,v 1.11 2021/01/27 02:00:02 thorpej Exp $	*/
 /*
  * Copyright (c) 2019 Matthew R. Green
  * 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.
 @@ -20,27 +20,27 @@
  * 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: rk_tsadc.c,v 1.10 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.11 2021/01/27 02:00:02 thorpej Exp $");
 /*
  * Driver for the TSADC temperature sensor monitor in RK3328 and RK3399.
+ *
  * TODO:
  * - handle setting various temp values
  * - handle DT trips/temp value defaults
  * - interrupts aren't triggered (test by lowering warn/crit values), and
  *   once they work, make the interrupt do something
  */
 #include <sys/param.h>
 #include <sys/bus.h>
 @@ -367,27 +367,27 @@ static const rk_data rk3399_data_table =
 	.rd_array = rk3399_data_array,
 	.rd_size = __arraycount(rk3399_data_array),
 	.rd_init = rk_tsadc_init_rk3399,
 	.rd_decr = false,
 	.rd_max = 686,
 	.rd_min = 401,
 	.rd_auto_period = RK3399_TSADC_AUTO_PERIOD_TIME,
 	.rd_num_sensors = 2,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3328-tsadc",	.data = &rk3328_data_table },
 	{ .compat = "rockchip,rk3399-tsadc",	.data = &rk3399_data_table },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 #define	TSADC_READ(sc, reg)		\
 	bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
 #define	TSADC_WRITE(sc, reg, val)	\
 	bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
 CFATTACH_DECL3_NEW(rk_tsadc, sizeof(struct rk_tsadc_softc),
 	rk_tsadc_match, rk_tsadc_attach, rk_tsadc_detach, NULL, NULL, NULL,
 	DVF_DETACH_SHUTDOWN);
 /* init/teardown support */
 static int

 @@ -1,14 +1,14 @@
-/* $NetBSD: rk_usb.c,v 1.9 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_usb.c,v 1.10 2021/01/27 02:00:02 thorpej Exp $ */
 /*-
  * Copyright (c) 2018 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.
 @@ -18,27 +18,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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: rk_usb.c,v 1.9 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.10 2021/01/27 02:00:02 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kmem.h>
 #include <dev/clk/clk_backend.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/syscon.h>
 @@ -61,27 +61,27 @@ static void rk_usb_attach(device_t, devi
 #define	 RK3399_USBPHY_SUSPEND_N	__BIT(1)
 #define	 RK3399_USBPHY_UTMI_SEL		__BIT(0)
 #define	RK3399_PHY_NO(_sc)	((_sc)->sc_reg == 0xe450 ? 0 : 1)
 enum rk_usb_type {
 	USB_RK3328 = 1,
 	USB_RK3399,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3328-usb2phy",	.value = USB_RK3328 },
 	{ .compat = "rockchip,rk3399-usb2phy",	.value = USB_RK3399 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct rk_usb_clk {
 	struct clk		base;
 };
 struct rk_usb_softc {
 	device_t		sc_dev;
 	struct syscon		*sc_syscon;
 	enum rk_usb_type	sc_type;
 	struct clk_domain	sc_clkdom;
 	struct rk_usb_clk	sc_usbclk;