 @@ -1,14 +1,14 @@
-/* $NetBSD: ti_gpio.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.9 2021/01/27 02:12:16 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,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: ti_gpio.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.9 2021/01/27 02:12:16 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/bitops.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/gpio/gpiovar.h>
 @@ -92,27 +92,27 @@ static const u_int ti_gpio_regmap[TI_NGP
 		[GPIO_DATAOUT]		= 0x13c,
 		[GPIO_LEVELDETECT0]	= 0x140,
 		[GPIO_LEVELDETECT1]	= 0x144,
 		[GPIO_RISINGDETECT]	= 0x148,
 		[GPIO_FALLINGDETECT]	= 0x14c,
 		[GPIO_CLEARDATAOUT]	= 0x190,
 		[GPIO_SETDATAOUT]	= 0x194,
 	},
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "ti,omap3-gpio",	.value = TI_GPIO_OMAP3 },
 	{ .compat = "ti,omap4-gpio",	.value = TI_GPIO_OMAP4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct ti_gpio_intr {
 	u_int intr_pin;
 	int (*intr_func)(void *);
 	void *intr_arg;
 	bool intr_mpsafe;
 };
 struct ti_gpio_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ti_sdhc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_sdhc.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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
 @@ -19,27 +19,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: ti_sdhc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_sdhc.c,v 1.9 2021/01/27 02:12:16 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/bus.h>
 #include <arm/ti/ti_prcm.h>
 @@ -85,27 +85,27 @@ static const struct ti_sdhc_config omap4
 	.regoff = 0x100
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "ti,omap2-hsmmc",
 	  .data = &omap2_hsmmc_config },
 	{ .compat = "ti,omap3-hsmmc",
 	  .data = &omap2_hsmmc_config },
 	{ .compat = "ti,omap3-pre-es3-hsmmc",
 	  .data = &omap3_pre_es3_hsmmc_config },
 	{ .compat = "ti,omap4-hsmmc",
 	  .data = &omap4_hsmmc_config },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 enum {
 	EDMA_CHAN_TX,
 	EDMA_CHAN_RX,
 	EDMA_NCHAN
 };
 struct ti_sdhc_softc {
 	struct sdhc_softc	sc;
 	int			sc_phandle;
 	bus_addr_t		sc_addr;
 	bus_space_tag_t		sc_bst;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ti_iic.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: ti_iic.c,v 1.12 2021/01/27 02:12:16 thorpej Exp $ */
 /*
  * Copyright (c) 2013 Manuel Bouyer.  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.
+ *
 @@ -40,27 +40,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: ti_iic.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_iic.c,v 1.12 2021/01/27 02:12:16 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <dev/i2c/i2cvar.h>
 @@ -140,27 +140,27 @@ static const u_int ti_iic_regmap[TI_NTYP
 		[I2C_OA] = 0xa8,
 		[I2C_SA] = 0xac,
 		[I2C_PSC] = 0xb0,
 		[I2C_SCLL] = 0xb4,
 		[I2C_SCLH] = 0xb8,
 		[I2C_BUFSTAT] = 0xc0,
 	},
 };
 static const struct device_compatible_entry compat_data[] = {
 	/* compatible			type */
 	{ .compat = "ti,omap3-i2c",	.value = TI_IIC_OMAP3 },
 	{ .compat = "ti,omap4-i2c",	.value = TI_IIC_OMAP4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 /* operation in progress */
 typedef enum {
 	TI_I2CREAD,
 	TI_I2CWRITE,
 	TI_I2CDONE,
 	TI_I2CERROR
 } ti_i2cop_t;
 struct ti_iic_softc {
 	device_t		sc_dev;
 	struct i2c_controller	sc_ic;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ti_omapintc.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_omapintc.c,v 1.7 2021/01/27 02:12:16 thorpej Exp $	*/
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
  */
 /*
  * 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 this list of conditions
  *    and the following disclaimer.
  * 2. Redistributions in binary form must reproduce this list of conditions
  *    and the following disclaimer in the documentation and/or other materials
 @@ -19,27 +19,27 @@
  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ANY
  * 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.
  */
 #define _INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.7 2021/01/27 02:12:16 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/evcnt.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <uvm/uvm_extern.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <arm/cpu.h>
 #include <arm/armreg.h>
 @@ -51,27 +51,27 @@ __KERNEL_RCSID(0, "$NetBSD: ti_omapintc.
 #define INTC_CONTROL_NEWIRQAGR	__BIT(0)
 #define INTC_ITR		0x080
 #define INTC_MIR		0x084
 #define INTC_MIR_CLEAR		0x088
 #define INTC_MIR_SET		0x08c
 #define INTC_PENDING_IRQ	0x098
 #define INTC_MAX_SOURCES	128
 static const struct device_compatible_entry compat_data[] = {
 	/* compatible			number of banks */
 	{ .compat = "ti,omap3-intc",	.value = 3 },
 	{ .compat = "ti,am33xx-intc",	.value = 4 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 #define	INTC_READ(sc, g, o)		\
 	bus_space_read_4((sc)->sc_memt, (sc)->sc_memh, (g) * 0x20 + (o))
 #define	INTC_WRITE(sc, g, o, v)	\
 	bus_space_write_4((sc)->sc_memt, (sc)->sc_memh, (g) * 0x20 + (o), v)
 static int omap2icu_match(device_t, cfdata_t, void *);
 static void omap2icu_attach(device_t, device_t, void *);
 static void omap2icu_unblock_irqs(struct pic_softc *, size_t, uint32_t);
 static void omap2icu_block_irqs(struct pic_softc *, size_t, uint32_t);
 static void omap2icu_establish_irq(struct pic_softc *, struct intrsource *);

 @@ -1,17 +1,17 @@
-/*	$NetBSD: ti_omaptimer.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $	*/
+/*	$NetBSD: ti_omaptimer.c,v 1.8 2021/01/27 02:12:16 thorpej Exp $	*/
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.7 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omaptimer.c,v 1.8 2021/01/27 02:12:16 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/kernel.h>
 #include <arm/locore.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <dev/fdt/fdtvar.h>
 @@ -55,27 +55,27 @@ static uint8_t omaptimer_regmap[_DM_NTIM
 	[DM_TIMER_OMAP3430] = {
 		[TIMER_TISR]	= 0x18,
 		[TIMER_TIER]	= 0x1c,
 		[TIMER_TCLR] 	= 0x24,
 		[TIMER_TCRR]	= 0x28,
 		[TIMER_TLDR]	= 0x2c,
 	},
 };
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "ti,am335x-timer-1ms",	.value = DM_TIMER_AM335X },
 	{ .compat = "ti,am335x-timer",		.value = DM_TIMER_AM335X },
 	{ .compat = "ti,omap3430-timer",	.value = DM_TIMER_OMAP3430 },
-	{ }
+	DEVICE_COMPAT_EOL
 };
 struct omaptimer_softc {
 	device_t sc_dev;
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh;
 	int sc_phandle;
 	enum omaptimer_type sc_type;
 	struct timecounter sc_tc;
 };
 #define	RD4(sc, reg)			\
 	bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, omaptimer_regmap[(sc)->sc_type][(reg)])