Wed Jan 27 02:12:16 2021 UTC ()
Use DEVICE_COMPAT_EOL.
(thorpej)
diff -r1.8 -r1.9 src/sys/arch/arm/ti/ti_gpio.c
diff -r1.8 -r1.9 src/sys/arch/arm/ti/ti_sdhc.c
diff -r1.11 -r1.12 src/sys/arch/arm/ti/ti_iic.c
diff -r1.6 -r1.7 src/sys/arch/arm/ti/ti_omapintc.c
diff -r1.7 -r1.8 src/sys/arch/arm/ti/ti_omaptimer.c
--- src/sys/arch/arm/ti/ti_gpio.c 2021/01/25 14:20:39 1.8
+++ src/sys/arch/arm/ti/ti_gpio.c 2021/01/27 02:12:16 1.9
@@ -1,4 +1,4 @@
-/* $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>
@@ -27,7 +27,7 @@
*/
#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>
@@ -102,7 +102,7 @@
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 {
--- src/sys/arch/arm/ti/ti_sdhc.c 2021/01/25 14:20:39 1.8
+++ src/sys/arch/arm/ti/ti_sdhc.c 2021/01/27 02:12:16 1.9
@@ -1,4 +1,4 @@
-/* $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.
@@ -29,7 +29,7 @@
*/
#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>
@@ -95,7 +95,7 @@
{ .compat = "ti,omap4-hsmmc",
.data = &omap4_hsmmc_config },
- { }
+ DEVICE_COMPAT_EOL
};
enum {
--- src/sys/arch/arm/ti/ti_iic.c 2021/01/25 14:20:39 1.11
+++ src/sys/arch/arm/ti/ti_iic.c 2021/01/27 02:12:16 1.12
@@ -1,4 +1,4 @@
-/* $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.
@@ -50,7 +50,7 @@
*/
#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>
@@ -150,7 +150,7 @@
/* compatible type */
{ .compat = "ti,omap3-i2c", .value = TI_IIC_OMAP3 },
{ .compat = "ti,omap4-i2c", .value = TI_IIC_OMAP4 },
- { }
+ DEVICE_COMPAT_EOL
};
/* operation in progress */
--- src/sys/arch/arm/ti/ti_omapintc.c 2021/01/25 14:20:39 1.6
+++ src/sys/arch/arm/ti/ti_omapintc.c 2021/01/27 02:12:16 1.7
@@ -1,4 +1,4 @@
-/* $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.
@@ -29,7 +29,7 @@
#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>
@@ -61,7 +61,7 @@
/* 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) \
--- src/sys/arch/arm/ti/ti_omaptimer.c 2021/01/25 14:20:39 1.7
+++ src/sys/arch/arm/ti/ti_omaptimer.c 2021/01/27 02:12:16 1.8
@@ -1,7 +1,7 @@
-/* $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>
@@ -65,7 +65,7 @@
{ .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 {