 @@ -1,14 +1,14 @@
-/* $NetBSD: amdccp_fdt.c,v 1.3 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: amdccp_fdt.c,v 1.4 2021/01/25 14:25:09 thorpej Exp $ */
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
  * 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,51 +18,50 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER 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: amdccp_fdt.c,v 1.3 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_fdt.c,v 1.4 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/ic/amdccpvar.h>
 struct amdccp_fdt_softc {
 	struct amdccp_softc sc_sc;
 };
 static int amdccp_fdt_match(device_t, cfdata_t, void *);
 static void amdccp_fdt_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(amdccp_fdt, sizeof(struct amdccp_fdt_softc),
     amdccp_fdt_match, amdccp_fdt_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "amd,ccp-seattle-v1a" },
 	{ }
 	{ 0 }
 };
 static int
 amdccp_fdt_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
 amdccp_fdt_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: panel_fdt.c,v 1.3 2021/01/18 02:35:49 thorpej Exp $	*/
+/*	$NetBSD: panel_fdt.c,v 1.4 2021/01/25 14:25:09 thorpej Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -29,27 +29,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * lvds panel driver.
  * specified in linux/Documentation/devicetree/bindings/display/panel/
  * Simple RGB panels could be added as well
  * registers an endpoint for use by graphic controller drivers
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: panel_fdt.c,v 1.3 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: panel_fdt.c,v 1.4 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/panel_fdt.h>
 static int fdt_panel_match(device_t, cfdata_t, void *);
 static void fdt_panel_attach(device_t, device_t, void *);
 static void *fdt_panel_get_data(device_t, struct fdt_endpoint *);
 @@ -61,28 +61,27 @@ struct fdt_panel_softc {
 	struct fdt_panel sc_panel;
 	struct fdt_device_ports sc_ports;
 #define MAX_GPIO_ENABLES 8
 	struct fdtbus_gpio_pin *sc_gpios_enable[MAX_GPIO_ENABLES];
 };
 CFATTACH_DECL_NEW(fdt_panel, sizeof(struct fdt_panel_softc),
     fdt_panel_match, fdt_panel_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "panel-lvds",	.value = PANEL_LVDS},
 	{ .compat = "panel-dual-lvds",	.value = PANEL_DUAL_LVDS},
 	{ }
 	{ 0 }
 };
 static int
 fdt_panel_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const struct fdt_attach_args *faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 fdt_panel_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: connector_fdt.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $	*/
+/*	$NetBSD: connector_fdt.c,v 1.3 2021/01/25 14:25:09 thorpej Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
  */
 /*
  * connector driver.
  * specified in linux/Documentation/devicetree/bindings/display/connector/
  * basically it only register its endpoint.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: connector_fdt.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: connector_fdt.c,v 1.3 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
 #include <dev/fdt/connector_fdt.h>
 static int fdt_connector_match(device_t, cfdata_t, void *);
 static void fdt_connector_attach(device_t, device_t, void *);
 @@ -64,28 +64,27 @@ struct fdt_connector_softc {
 	struct fdt_device_ports sc_ports;
 };
 #define sc_type sc_con.con_type
 CFATTACH_DECL_NEW(fdt_connector, sizeof(struct fdt_connector_softc),
     fdt_connector_match, fdt_connector_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "composite-video-connector",	.value = CON_TV},
 	{ .compat = "dvi-connector",			.value = CON_DVI},
 	{ .compat = "hdmi-connector",			.value = CON_HDMI},
 	{ .compat = "vga-connector",			.value = CON_VGA},
 	{ }
 	{ 0 }
 };
 static int
 fdt_connector_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const struct fdt_attach_args *faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 fdt_connector_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: pinctrl_single.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: pinctrl_single.c,v 1.3 2021/01/25 14:25:09 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.
 @@ -17,54 +17,53 @@
  * 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: pinctrl_single.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pinctrl_single.c,v 1.3 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/gpio.h>
 #include <dev/fdt/fdtvar.h>
 #define	PINCTRL_FLAG_PINCONF	__BIT(0)	/* supports generic pinconf */
 struct pinctrl_single_config {
 	uint32_t	flags;
 };
 static const struct pinctrl_single_config pinctrl_config = {
 };
 static const struct pinctrl_single_config pinconf_config = {
 	.flags = PINCTRL_FLAG_PINCONF
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "pinctrl-single",	.data = &pinctrl_config },
 	{ .compat = "pinconf-single",	.data = &pinconf_config },
 	{ }
 	{ 0 }
 };
 struct pinctrl_single_softc {
 	device_t			sc_dev;
 	int				sc_phandle;
 	bus_space_tag_t			sc_bst;
 	bus_space_handle_t		sc_bsh;
 	uint32_t			sc_flags;
 	u_int				sc_regwidth;
 	u_int				sc_funcmask;
 };
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmt_fdt.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $ */
+/*	$NetBSD: vmt_fdt.c,v 1.3 2021/01/25 14:25:09 thorpej Exp $ */
 /*
  * Copyright (c) 2020 Ryo Shimizu <ryo@nerv.org>
  * 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,46 +17,45 @@
  * OR 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: vmt_fdt.c,v 1.2 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmt_fdt.c,v 1.3 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/vmt/vmtreg.h>
 #include <dev/vmt/vmtvar.h>
 static int vmt_fdt_match(device_t, cfdata_t, void *);
 static void vmt_fdt_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(vmt_fdt, sizeof(struct vmt_softc),
     vmt_fdt_match, vmt_fdt_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "vmware" },
 	{ }
 	{ 0 }
 };
 static int
 vmt_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
 	const struct fdt_attach_args * const faa = aux;
 	if (OF_finddevice("/hypervisor") != faa->faa_phandle)
 		return 0;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dwc2_fdt.c,v 1.7 2021/01/18 02:35:49 thorpej Exp $	*/
+/*	$NetBSD: dwc2_fdt.c,v 1.8 2021/01/25 14:25:09 thorpej Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 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: dwc2_fdt.c,v 1.7 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.8 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <sys/workqueue.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 @@ -82,27 +82,27 @@ static const struct dwc2_fdt_config dwc2
 static const struct dwc2_fdt_config dwc2_fdt_generic_config = {
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "amlogic,meson8b-usb",
 	  .data = &dwc2_fdt_meson8b_config },
 	{ .compat = "amlogic,meson-gxbb-usb",
 	  .data = &dwc2_fdt_meson8b_config },
 	{ .compat = "rockchip,rk3066-usb",
 	  .data = &dwc2_fdt_rk3066_config },
 	{ .compat = "snps,dwc2",
 	  .data = &dwc2_fdt_generic_config },
-	{ 0 }
+	{ }
 };
 CFATTACH_DECL_NEW(dwc2_fdt, sizeof(struct dwc2_fdt_softc),
     dwc2_fdt_match, dwc2_fdt_attach, NULL, NULL);
 /* ARGSUSED */
 static int
 dwc2_fdt_match(device_t parent, struct cfdata *match, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i2cmux_fdt.c,v 1.7 2021/01/25 12:18:18 jmcneill Exp $	*/
+/*	$NetBSD: i2cmux_fdt.c,v 1.8 2021/01/25 14:25:09 thorpej Exp $	*/
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR 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 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: i2cmux_fdt.c,v 1.7 2021/01/25 12:18:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2cmux_fdt.c,v 1.8 2021/01/25 14:25:09 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/i2c/i2cmuxvar.h>
 /*****************************************************************************/
 @@ -233,27 +233,27 @@ static const struct iicmux_config iicmux
 	.acquire_bus = iicmux_pinctrl_acquire_bus,
 	.release_bus = iicmux_pinctrl_release_bus,
 };
 /*****************************************************************************/
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "i2c-mux-gpio",
 	  .data = &iicmux_gpio_config },
 	{ .compat = "i2c-mux-pinctrl",
 	  .data = &iicmux_pinctrl_config },
-	{ NULL }
+	{ }
 };
 static int
 iicmux_fdt_match(device_t const parent, cfdata_t const match, void * const aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}
 static void
 iicmux_fdt_attach(device_t const parent, device_t const self, void * const aux)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.13 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.14 2021/01/25 14:25:09 thorpej Exp $ */
 /*-
  * Copyright (c) 2015-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.
 @@ -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: dwcmmc_fdt.c,v 1.13 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.14 2021/01/25 14:25:09 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/mutex.h>
 #include <sys/condvar.h>
 #include <sys/gpio.h>
 #include <dev/ic/dwc_mmc_var.h>
 #include <dev/sdmmc/sdmmcchip.h>
 @@ -58,28 +58,27 @@ struct dwcmmc_fdt_config {
 	u_int		flags;
 	uint32_t	intr_cardmask;
 };
 static const struct dwcmmc_fdt_config dwcmmc_rk3288_config = {
 	.ciu_div = 2,
 	.flags = DWC_MMC_F_USE_HOLD_REG |
 		 DWC_MMC_F_DMA,
 	.intr_cardmask = __BIT(24),
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "rockchip,rk3288-dw-mshc",	.data = &dwcmmc_rk3288_config },
 	{ }
 	{ 0 }
 };
 struct dwcmmc_fdt_softc {
 	struct dwc_mmc_softc	sc;
 	struct clk		*sc_clk_biu;
 	struct clk		*sc_clk_ciu;
 	struct fdtbus_gpio_pin	*sc_pin_cd;
 	const struct dwcmmc_fdt_config *sc_conf;
 	u_int			sc_ciu_div;
 	struct fdtbus_regulator	*sc_vqmmc;
 	struct fdtbus_mmc_pwrseq *sc_pwrseq;
 };

 @@ -1,14 +1,14 @@
-/* $NetBSD: ns8250_uart.c,v 1.4 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: ns8250_uart.c,v 1.5 2021/01/25 14:25:09 thorpej Exp $ */
 /*-
  * Copyright (c) 2017-2020 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: ns8250_uart.c,v 1.4 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ns8250_uart.c,v 1.5 2021/01/25 14:25:09 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/termios.h>
 #include <dev/ic/comvar.h>
 #include <dev/fdt/fdtvar.h>
 @@ -74,28 +74,27 @@ ns8250_octeon_enable(struct com_softc *s
 static const struct ns8250_config octeon_config = {
 	.type = COM_TYPE_16550_NOERS,
 	.enable = ns8250_octeon_enable,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "cavium,octeon-3860-uart",	.data = &octeon_config },
 	{ .compat = "ns8250",			.data = &ns8250_config },
 	{ .compat = "ns16450",			.data = &ns8250_config },
 	{ .compat = "ns16550a",			.data = &ns8250_config },
 	{ .compat = "ns16550",			.data = &ns8250_config },
 	{ .compat = "ns16750",			.data = &ns16750_config },
 	{ }
 	{ 0 }
 };
 CFATTACH_DECL_NEW(ns8250_uart, sizeof(struct com_softc),
 	ns8250_uart_match, ns8250_uart_attach, NULL, NULL);
 static int
 ns8250_uart_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	return of_match_compat_data(faa->faa_phandle, compat_data);
+}