 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet_imx.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: if_enet_imx.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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,53 +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: if_enet_imx.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
 #include "opt_fdt.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <arm/imx/if_enetreg.h>
 #include <arm/imx/if_enetvar.h>
 #include <dev/fdt/fdtvar.h>
 struct enet_fdt_softc {
 	struct enet_softc sc_enet;
 	struct fdtbus_gpio_pin *sc_pin_reset;
 };
 CFATTACH_DECL_NEW(enet_fdt, sizeof(struct enet_fdt_softc),
     enet_match, enet_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	/* compatible			imxtype */
 	{ .compat = "fsl,imx6q-fec",	.value = 6 },
 	{ .compat = "fsl,imx6sx-fec",	.value = 7 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int enet_init_clocks(struct enet_softc *);
 static void enet_phy_reset(struct enet_fdt_softc *, const int);
 static int enet_phy_id(struct enet_softc *, const int);
 static void *enet_intr_establish(struct enet_softc *, int, u_int);
 int
 enet_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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx6_pcie.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: imx6_pcie.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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: imx6_pcie.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
 #include "opt_pci.h"
 #include "opt_fdt.h"
 #include "pci.h"
 #include "locators.h"
 #define	_INTR_PRIVATE
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 @@ -82,27 +82,27 @@ static void imx6_pcie_reset(void *);
 #define IMX6_PCIE_MEM_BASE	0x01000000
 #define IMX6_PCIE_MEM_SIZE	0x00f00000 /* 15MB */
 #define IMX6_PCIE_ROOT_BASE	0x01f00000
 #define IMX6_PCIE_ROOT_SIZE	0x00080000 /* 512KB */
 #define IMX6_PCIE_IO_BASE	0x01f80000
 #define IMX6_PCIE_IO_SIZE	0x00010000 /* 64KB */
 CFATTACH_DECL_NEW(imxpcie_fdt, sizeof(struct imxpcie_fdt_softc),
     imx6_pcie_match, imx6_pcie_attach, NULL, NULL);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-pcie",	.value = false },
 	{ .compat = "fsl,imx6qp-pcie",	.value = true },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 imx6_pcie_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);
+}
 static void
 imx6_pcie_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx_sdhc.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: imx_sdhc.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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: imx_sdhc.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_sdhc.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
 #include "opt_fdt.h"
 #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/gpio.h>
 #include <dev/sdmmc/sdhcreg.h>
 #include <dev/sdmmc/sdhcvar.h>
 @@ -77,27 +77,27 @@ struct imx6_sdhc_config {
 static const struct imx6_sdhc_config imx6q_config = {
 	.flags = SDHC_FLAG_BROKEN_ADMA2_ZEROLEN |
 		 SDHC_FLAG_NO_BUSY_INTR,
 };
 static const struct imx6_sdhc_config imx7d_config = {
 	.flags = 0
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-usdhc",	.data = &imx6q_config },
 	{ .compat = "fsl,imx7d-usdhc",	.data = &imx7d_config },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 static int
 imx_sdhc_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);
+}
 static void
 imx_sdhc_attach(device_t parent, device_t self, void *aux)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx6_spi.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $	*/
+/*	$NetBSD: imx6_spi.c,v 1.6 2021/01/27 02:14:49 thorpej Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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: imx6_spi.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.6 2021/01/27 02:14:49 thorpej Exp $");
 #include "opt_imxspi.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/gpio.h>
 #include <arm/imx/imxspivar.h>
 #include <dev/fdt/fdtvar.h>
 @@ -52,27 +52,27 @@ struct imxspi_fdt_softc {
 struct imx_spi_config {
 	bool enhanced;
 	enum imxspi_type type;
 };
 static const struct imx_spi_config imx6q_spi_config = {
 	.enhanced = true,
 	.type = IMX51_ECSPI,
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-ecspi",	.data = &imx6q_spi_config },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 CFATTACH_DECL_NEW(imxspi_fdt, sizeof(struct imxspi_fdt_softc),
     imxspi_match, imxspi_attach, NULL, NULL);
 static int
 imxspi_cs_enable(void *arg, int slave)
+{
 	struct imxspi_fdt_softc * const sc = arg;
 	fdtbus_gpio_write(sc->sc_pin_cs[slave], 1);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: imx8mq_usbphy.c,v 1.3 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: imx8mq_usbphy.c,v 1.4 2021/01/27 02:14:49 thorpej Exp $ */
 /*-
  * Copyright (c) 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(0, "$NetBSD: imx8mq_usbphy.c,v 1.3 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx8mq_usbphy.c,v 1.4 2021/01/27 02:14:49 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/fdt/fdtvar.h>
 #define	PHY_CTL0_ADDR		0x00
 #define	 REF_SSP_EN		__BIT(2)
 @@ -47,27 +47,27 @@ __KERNEL_RCSID(0, "$NetBSD: imx8mq_usbph
 #define	 PHY_VDATSRCENB0	__BIT(19)
 #define	 PHY_ATERESET		__BIT(3)
 #define	 PHY_COMMONONN		__BIT(1)
 #define	 PHY_RESET		__BIT(0)
 #define	PHY_CTL2_ADDR		0x08
 #define	 PHY_TXENABLEN0		__BIT(8)
 static int imx8mq_usbphy_match(device_t, cfdata_t, void *);
 static void imx8mq_usbphy_attach(device_t, device_t, void *);
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx8mq-usb-phy" },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct imx8mq_usbphy_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh;
 	int			sc_phandle;
 };
 #define	PHY_READ(sc, reg)				\
 	bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
 #define	PHY_WRITE(sc, reg, val)			\
 	bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))