Module Name: src
Committed By: thorpej
Date: Wed Jan 27 02:09:39 UTC 2021
Modified Files:
src/sys/arch/arm/sunxi: sun4i_a10_ccu.c sun4i_dma.c sun6i_dma.c
sun8i_crypto.c sunxi_can.c sunxi_codec.c sunxi_de2_ccu.c
sunxi_dep.c sunxi_emac.c sunxi_gpio.c sunxi_hdmi.c sunxi_hdmiphy.c
sunxi_i2s.c sunxi_lcdc.c sunxi_lradc.c sunxi_mixer.c sunxi_mmc.c
sunxi_musb.c sunxi_nmi.c sunxi_pwm.c sunxi_rsb.c sunxi_rtc.c
sunxi_sid.c sunxi_sramc.c sunxi_tcon.c sunxi_thermal.c sunxi_ts.c
sunxi_twi.c sunxi_usb3phy.c sunxi_usbphy.c sunxi_wdt.c
Log Message:
Use DEVICE_COMPAT_EOL.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/sunxi/sun4i_a10_ccu.c \
src/sys/arch/arm/sunxi/sunxi_mixer.c \
src/sys/arch/arm/sunxi/sunxi_usbphy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sun4i_dma.c \
src/sys/arch/arm/sunxi/sunxi_can.c src/sys/arch/arm/sunxi/sunxi_hdmiphy.c \
src/sys/arch/arm/sunxi/sunxi_ts.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/sunxi/sun6i_dma.c \
src/sys/arch/arm/sunxi/sunxi_hdmi.c src/sys/arch/arm/sunxi/sunxi_rsb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sunxi/sun8i_crypto.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sunxi/sunxi_codec.c \
src/sys/arch/arm/sunxi/sunxi_i2s.c src/sys/arch/arm/sunxi/sunxi_lcdc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_de2_ccu.c \
src/sys/arch/arm/sunxi/sunxi_dep.c src/sys/arch/arm/sunxi/sunxi_pwm.c \
src/sys/arch/arm/sunxi/sunxi_sid.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_emac.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_lradc.c \
src/sys/arch/arm/sunxi/sunxi_wdt.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/sunxi/sunxi_mmc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sunxi_musb.c \
src/sys/arch/arm/sunxi/sunxi_rtc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sunxi/sunxi_nmi.c \
src/sys/arch/arm/sunxi/sunxi_sramc.c src/sys/arch/arm/sunxi/sunxi_tcon.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_thermal.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/sunxi/sunxi_twi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_usb3phy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sun4i_a10_ccu.c
diff -u src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.14 src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.15
--- src/sys/arch/arm/sunxi/sun4i_a10_ccu.c:1.14 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sun4i_a10_ccu.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_a10_ccu.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sun4i_a10_ccu.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun4i_a10_ccu.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_a10_ccu.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,7 @@ enum sun4i_a10_ccu_type {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-ccu", .value = CCU_A10 },
{ .compat = "allwinner,sun7i-a20-ccu", .value = CCU_A20 },
- { }
+ DEVICE_COMPAT_EOL
};
CFATTACH_DECL_NEW(sunxi_a10_ccu, sizeof(struct sunxi_ccu_softc),
Index: src/sys/arch/arm/sunxi/sunxi_mixer.c
diff -u src/sys/arch/arm/sunxi/sunxi_mixer.c:1.14 src/sys/arch/arm/sunxi/sunxi_mixer.c:1.15
--- src/sys/arch/arm/sunxi/sunxi_mixer.c:1.14 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_mixer.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mixer.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_mixer.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -206,7 +206,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-a64-de2-mixer-1",
.data = &mixer1_data },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_mixer_softc;
Index: src/sys/arch/arm/sunxi/sunxi_usbphy.c
diff -u src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.14 src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.15
--- src/sys/arch/arm/sunxi/sunxi_usbphy.c:1.14 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_usbphy.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_usbphy.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_usbphy.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_usbphy.c,v 1.14 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_usbphy.c,v 1.15 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -93,7 +93,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun8i-h3-usb-phy", .value = USBPHY_H3 },
{ .compat = "allwinner,sun50i-a64-usb-phy", .value = USBPHY_A64 },
{ .compat = "allwinner,sun50i-h6-usb-phy", .value = USBPHY_H6 },
- { }
+ DEVICE_COMPAT_EOL
};
#define SUNXI_MAXUSBPHY 4
Index: src/sys/arch/arm/sunxi/sun4i_dma.c
diff -u src/sys/arch/arm/sunxi/sun4i_dma.c:1.6 src/sys/arch/arm/sunxi/sun4i_dma.c:1.7
--- src/sys/arch/arm/sunxi/sun4i_dma.c:1.6 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sun4i_dma.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_dma.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sun4i_dma.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-dma" },
- { }
+ DEVICE_COMPAT_EOL
};
struct sun4idma_channel {
Index: src/sys/arch/arm/sunxi/sunxi_can.c
diff -u src/sys/arch/arm/sunxi/sunxi_can.c:1.6 src/sys/arch/arm/sunxi/sunxi_can.c:1.7
--- src/sys/arch/arm/sunxi/sunxi_can.c:1.6 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_can.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_can.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_can.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -87,7 +87,7 @@ struct sunxi_can_softc {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-can" },
- { }
+ DEVICE_COMPAT_EOL
};
static int sunxi_can_match(device_t, cfdata_t, void *);
Index: src/sys/arch/arm/sunxi/sunxi_hdmiphy.c
diff -u src/sys/arch/arm/sunxi/sunxi_hdmiphy.c:1.6 src/sys/arch/arm/sunxi/sunxi_hdmiphy.c:1.7
--- src/sys/arch/arm/sunxi/sunxi_hdmiphy.c:1.6 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_hdmiphy.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmiphy.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_hdmiphy.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmiphy.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmiphy.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -121,7 +121,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-a64-hdmi-phy",
.data = &sun8i_h3_hdmiphy_data },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_hdmiphy_softc {
Index: src/sys/arch/arm/sunxi/sunxi_ts.c
diff -u src/sys/arch/arm/sunxi/sunxi_ts.c:1.6 src/sys/arch/arm/sunxi/sunxi_ts.c:1.7
--- src/sys/arch/arm/sunxi/sunxi_ts.c:1.6 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_ts.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ts.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_ts.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.6 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.7 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -135,7 +135,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun4i-a10-ts", .data = &sun4i_a10_ts_config },
{ .compat = "allwinner,sun5i-a13-ts", .data = &sun5i_a13_ts_config },
{ .compat = "allwinner,sun6i-a31-ts", .data = &sun6i_a31_ts_config },
- { }
+ DEVICE_COMPAT_EOL
};
static struct wsmouse_calibcoords sunxi_ts_default_calib = {
Index: src/sys/arch/arm/sunxi/sun6i_dma.c
diff -u src/sys/arch/arm/sunxi/sun6i_dma.c:1.12 src/sys/arch/arm/sunxi/sun6i_dma.c:1.13
--- src/sys/arch/arm/sunxi/sun6i_dma.c:1.12 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sun6i_dma.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun6i_dma.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sun6i_dma.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun6i_dma.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun6i_dma.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -161,7 +161,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-a64-dma",
.data = &sun50i_a64_dma_config },
- { }
+ DEVICE_COMPAT_EOL
};
struct sun6idma_channel {
Index: src/sys/arch/arm/sunxi/sunxi_hdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.12 src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.13
--- src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.12 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_hdmi.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,7 +108,7 @@ struct sunxi_hdmi_softc {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-hdmi", .value = HDMI_A10},
{ .compat = "allwinner,sun7i-a20-hdmi", .value = HDMI_A10},
- { }
+ DEVICE_COMPAT_EOL
};
static int sunxi_hdmi_match(device_t, cfdata_t, void *);
Index: src/sys/arch/arm/sunxi/sunxi_rsb.c
diff -u src/sys/arch/arm/sunxi/sunxi_rsb.c:1.12 src/sys/arch/arm/sunxi/sunxi_rsb.c:1.13
--- src/sys/arch/arm/sunxi/sunxi_rsb.c:1.12 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_rsb.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rsb.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_rsb.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.12 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.13 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -52,7 +52,7 @@ enum sunxi_rsb_type {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun6i-a31-p2wi", .value = SUNXI_P2WI },
{ .compat = "allwinner,sun8i-a23-rsb", .value = SUNXI_RSB },
- { }
+ DEVICE_COMPAT_EOL
};
#define RSB_ADDR_PMIC_PRIMARY 0x3a3
Index: src/sys/arch/arm/sunxi/sun8i_crypto.c
diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.21 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.22
--- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.21 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sun8i_crypto.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_crypto.c,v 1.21 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sun8i_crypto.c,v 1.22 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.21 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.22 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -320,7 +320,7 @@ CFATTACH_DECL_NEW(sun8i_crypto, sizeof(s
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun50i-a64-crypto" },
- { }
+ DEVICE_COMPAT_EOL
};
static int
Index: src/sys/arch/arm/sunxi/sunxi_codec.c
diff -u src/sys/arch/arm/sunxi/sunxi_codec.c:1.10 src/sys/arch/arm/sunxi/sunxi_codec.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_codec.c:1.10 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_codec.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_codec.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_codec.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -93,7 +93,7 @@ static const struct device_compatible_en
A31_CODEC_COMPATDATA,
H3_CODEC_COMPATDATA,
- { }
+ DEVICE_COMPAT_EOL
};
#define CODEC_READ(sc, reg) \
Index: src/sys/arch/arm/sunxi/sunxi_i2s.c
diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.10 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.10 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_i2s.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_i2s.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_i2s.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -145,7 +145,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun8i-h3-i2s",
.data = &sun8i_h3_config },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_i2s_softc;
Index: src/sys/arch/arm/sunxi/sunxi_lcdc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.10 src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.10 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_lcdc.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lcdc.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_lcdc.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.10 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.11 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -110,7 +110,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun8i-h3-tcon-tv", .value = TYPE_TCON1 },
{ .compat = "allwinner,sun50i-a64-tcon-lcd", .value = TYPE_TCON0 },
{ .compat = "allwinner,sun50i-a64-tcon-tv", .value = TYPE_TCON1 },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_lcdc_softc;
Index: src/sys/arch/arm/sunxi/sunxi_de2_ccu.c
diff -u src/sys/arch/arm/sunxi/sunxi_de2_ccu.c:1.5 src/sys/arch/arm/sunxi/sunxi_de2_ccu.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_de2_ccu.c:1.5 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_de2_ccu.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_de2_ccu.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_de2_ccu.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_de2_ccu.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_de2_ccu.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -105,7 +105,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-h5-de2-clk",
.data = &sun50i_a64_de2_config },
- { }
+ DEVICE_COMPAT_EOL
};
static int
Index: src/sys/arch/arm/sunxi/sunxi_dep.c
diff -u src/sys/arch/arm/sunxi/sunxi_dep.c:1.5 src/sys/arch/arm/sunxi/sunxi_dep.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_dep.c:1.5 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_dep.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_dep.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_dep.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_dep.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_dep.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -54,7 +54,7 @@ struct sunxi_dep_softc {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-display-engine" },
{ .compat = "allwinner,sun7i-a20-display-engine" },
- { }
+ DEVICE_COMPAT_EOL
};
static const char *fb_compat[] = {
Index: src/sys/arch/arm/sunxi/sunxi_pwm.c
diff -u src/sys/arch/arm/sunxi/sunxi_pwm.c:1.5 src/sys/arch/arm/sunxi/sunxi_pwm.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_pwm.c:1.5 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_pwm.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_pwm.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_pwm.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_pwm.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_pwm.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -60,7 +60,7 @@ enum sunxi_pwm_type {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun50i-a64-pwm", .value = PWM_A64 },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_pwm_softc {
Index: src/sys/arch/arm/sunxi/sunxi_sid.c
diff -u src/sys/arch/arm/sunxi/sunxi_sid.c:1.5 src/sys/arch/arm/sunxi/sunxi_sid.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_sid.c:1.5 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_sid.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_sid.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_sid.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_sid.c,v 1.5 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_sid.c,v 1.6 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -60,7 +60,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_sid_config },
{ .compat = "allwinner,sun8i-a83t-sid", .data = &sun8i_h3_sid_config },
{ .compat = "allwinner,sun50i-a64-sid", .data = &sun8i_h3_sid_config },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_sid_softc {
Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.31 src/sys/arch/arm/sunxi/sunxi_emac.c:1.32
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.31 Mon Jan 18 02:35:49 2021
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.31 2021/01/18 02:35:49 thorpej Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.32 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.31 2021/01/18 02:35:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.32 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,8 +136,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun8i-h3-emac", .value = EMAC_H3 },
{ .compat = "allwinner,sun50i-a64-emac", .value = EMAC_A64 },
{ .compat = "allwinner,sun50i-h6-emac", .value = EMAC_H6 },
-
- { 0 }
+ DEVICE_COMPAT_EOL
};
struct sunxi_emac_bufmap {
@@ -954,9 +953,9 @@ sunxi_emac_ioctl(struct ifnet *ifp, u_lo
static bool
sunxi_emac_has_internal_phy(struct sunxi_emac_softc *sc)
{
- const char * mdio_internal_compat[] = {
- "allwinner,sun8i-h3-mdio-internal",
- NULL
+ static const struct device_compatible_entry mdio_internal_compat[] = {
+ { .compat = "allwinner,sun8i-h3-mdio-internal" },
+ DEVICE_COMPAT_EOL
};
int phy;
@@ -969,7 +968,7 @@ sunxi_emac_has_internal_phy(struct sunxi
return false;
/* For internal PHY, check compatible string of parent node */
- return of_compatible(OF_parent(phy), mdio_internal_compat) >= 0;
+ return of_match_compat_data(OF_parent(phy), mdio_internal_compat);
}
static int
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.33 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.34
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.33 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.33 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.34 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.33 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.34 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -135,7 +135,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-h6-r-pinctrl",
.data = &sun50i_h6_r_padconf },
#endif
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_gpio_eint {
Index: src/sys/arch/arm/sunxi/sunxi_lradc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lradc.c:1.4 src/sys/arch/arm/sunxi/sunxi_lradc.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_lradc.c:1.4 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_lradc.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lradc.c,v 1.4 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_lradc.c,v 1.5 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2016, 2018 Manuel Bouyer
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lradc.c,v 1.4 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lradc.c,v 1.5 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -77,7 +77,7 @@ static bool sunxi_lradc_register_switche
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-lradc-keys" },
- { }
+ DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/sunxi/sunxi_wdt.c
diff -u src/sys/arch/arm/sunxi/sunxi_wdt.c:1.4 src/sys/arch/arm/sunxi/sunxi_wdt.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_wdt.c:1.4 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_wdt.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_wdt.c,v 1.4 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_wdt.c,v 1.5 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_wdt.c,v 1.4 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_wdt.c,v 1.5 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -83,7 +83,7 @@ enum sunxi_wdt_type {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-wdt", .value = WDT_SUN4I },
{ .compat = "allwinner,sun6i-a31-wdt", .value = WDT_SUN6I },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_wdt_softc {
Index: src/sys/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.44 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.45
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.44 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.44 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.45 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.44 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.45 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -299,7 +299,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-h6-emmc",
.data = &sun50i_h6_emmc_config },
- { }
+ DEVICE_COMPAT_EOL
};
static int
Index: src/sys/arch/arm/sunxi/sunxi_musb.c
diff -u src/sys/arch/arm/sunxi/sunxi_musb.c:1.8 src/sys/arch/arm/sunxi/sunxi_musb.c:1.9
--- src/sys/arch/arm/sunxi/sunxi_musb.c:1.8 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_musb.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_musb.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_musb.c,v 1.9 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.9 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -65,7 +65,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun6i-a13-musb", .value = 5 },
{ .compat = "allwinner,sun8i-h3-musb", .value = 4 },
{ .compat = "allwinner,sun8i-a33-musb", .value = 5 },
- { }
+ DEVICE_COMPAT_EOL
};
#define REMAPFLAG 0x8000
Index: src/sys/arch/arm/sunxi/sunxi_rtc.c
diff -u src/sys/arch/arm/sunxi/sunxi_rtc.c:1.8 src/sys/arch/arm/sunxi/sunxi_rtc.c:1.9
--- src/sys/arch/arm/sunxi/sunxi_rtc.c:1.8 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_rtc.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rtc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_rtc.c,v 1.9 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rtc.c,v 1.8 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rtc.c,v 1.9 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -261,7 +261,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-h6-rtc",
.data = &sun50i_h6_rtc_config },
- { }
+ DEVICE_COMPAT_EOL
};
#define SUNXI_RTC_CLK_LOSC 0
Index: src/sys/arch/arm/sunxi/sunxi_nmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_nmi.c:1.9 src/sys/arch/arm/sunxi/sunxi_nmi.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_nmi.c:1.9 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_nmi.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_nmi.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_nmi.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun9i-a80-nmi",
.data = &sun9i_a80_nmi_config },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_nmi_softc {
Index: src/sys/arch/arm/sunxi/sunxi_sramc.c
diff -u src/sys/arch/arm/sunxi/sunxi_sramc.c:1.9 src/sys/arch/arm/sunxi/sunxi_sramc.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_sramc.c:1.9 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_sramc.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_sramc.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_sramc.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_sramc.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_sramc.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -50,7 +50,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-a64-system-control" },
{ .compat = "allwinner,sun50i-h5-system-control" },
{ .compat = "allwinner,sun50i-h6-system-control" },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_sramc_area {
@@ -92,7 +92,7 @@ static const struct device_compatible_en
{ .compat = "allwinner,sun50i-a64-sram-c",
.data = &sunxi_sramc_area_c },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_sramc_node {
@@ -143,7 +143,7 @@ sunxi_sramc_init(struct sunxi_sramc_soft
{
const struct device_compatible_entry mmio_compat_data[] = {
{ .compat = "mmio-sram" },
- { }
+ DEVICE_COMPAT_EOL
};
int child;
Index: src/sys/arch/arm/sunxi/sunxi_tcon.c
diff -u src/sys/arch/arm/sunxi/sunxi_tcon.c:1.9 src/sys/arch/arm/sunxi/sunxi_tcon.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_tcon.c:1.9 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_tcon.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_tcon.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_tcon.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 Manuel Bouyer <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_tcon.c,v 1.9 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_tcon.c,v 1.10 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,7 @@ void sunxi_tcon_dump_regs(int);
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-tcon", .value = TCON_A10},
{ .compat = "allwinner,sun7i-a20-tcon", .value = TCON_A10},
- { }
+ DEVICE_COMPAT_EOL
};
static int sunxi_tcon_match(device_t, cfdata_t, void *);
Index: src/sys/arch/arm/sunxi/sunxi_thermal.c
diff -u src/sys/arch/arm/sunxi/sunxi_thermal.c:1.11 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.11 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.12 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.11 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.12 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -310,7 +310,7 @@ static struct device_compatible_entry co
{ .compat = "allwinner,sun8i-h3-ts", .data = &h3_config },
{ .compat = "allwinner,sun50i-a64-ts", .data = &a64_config },
{ .compat = "allwinner,sun50i-h5-ts", .data = &h5_config },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_thermal_softc {
Index: src/sys/arch/arm/sunxi/sunxi_twi.c
diff -u src/sys/arch/arm/sunxi/sunxi_twi.c:1.15 src/sys/arch/arm/sunxi/sunxi_twi.c:1.16
--- src/sys/arch/arm/sunxi/sunxi_twi.c:1.15 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_twi.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_twi.c,v 1.15 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_twi.c,v 1.16 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.15 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.16 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -75,7 +75,7 @@ static const struct sunxi_twi_config sun
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun4i-a10-i2c", .data = &sun4i_a10_i2c_config },
{ .compat = "allwinner,sun6i-a31-i2c", .data = &sun6i_a31_i2c_config },
- { }
+ DEVICE_COMPAT_EOL
};
CFATTACH_DECL_NEW(sunxi_twi, sizeof(struct gttwsi_softc),
Index: src/sys/arch/arm/sunxi/sunxi_usb3phy.c
diff -u src/sys/arch/arm/sunxi/sunxi_usb3phy.c:1.3 src/sys/arch/arm/sunxi/sunxi_usb3phy.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_usb3phy.c:1.3 Mon Jan 25 14:20:39 2021
+++ src/sys/arch/arm/sunxi/sunxi_usb3phy.c Wed Jan 27 02:09:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_usb3phy.c,v 1.3 2021/01/25 14:20:39 thorpej Exp $ */
+/* $NetBSD: sunxi_usb3phy.c,v 1.4 2021/01/27 02:09:39 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_usb3phy.c,v 1.3 2021/01/25 14:20:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_usb3phy.c,v 1.4 2021/01/27 02:09:39 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -69,7 +69,7 @@ enum sunxi_usb3phy_type {
static const struct device_compatible_entry compat_data[] = {
{ .compat = "allwinner,sun50i-h6-usb3-phy", .value = USB3PHY_H6 },
- { }
+ DEVICE_COMPAT_EOL
};
struct sunxi_usb3phy {
