Wed Jan 27 02:00:02 2021 UTC ()
Use DEVICE_COMPAT_EOL.
(thorpej)
diff -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk3399_iomux.c
diff -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_vop.c
diff -r1.5 -r1.6 src/sys/arch/arm/rockchip/rk_pwm.c
diff -r1.5 -r1.6 src/sys/arch/arm/rockchip/rk_v1crypto.c
diff -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk_tsadc.c
diff -r1.9 -r1.10 src/sys/arch/arm/rockchip/rk_usb.c
--- src/sys/arch/arm/rockchip/rk3399_iomux.c 2021/01/25 14:20:38 1.8
+++ src/sys/arch/arm/rockchip/rk3399_iomux.c 2021/01/27 02:00:02 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_iomux.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk3399_iomux.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca>
@@ -29,7 +29,7 @@
//#define RK3399_IOMUX_DEBUG
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk3399_iomux.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk3399_iomux.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -183,7 +183,7 @@
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3399-pinctrl", .data = &rk3399_iomux_conf },
- { }
+ DEVICE_COMPAT_EOL
};
struct rk3399_iomux_softc {
--- src/sys/arch/arm/rockchip/rk_vop.c 2021/01/25 14:20:38 1.8
+++ src/sys/arch/arm/rockchip/rk_vop.c 2021/01/27 02:00:02 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_vop.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.8 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.9 2021/01/27 02:00:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -224,7 +224,7 @@
{ .compat = "rockchip,rk3399-vop-lit",
.data = &rk3399_vop_lit_config },
- { }
+ DEVICE_COMPAT_EOL
};
static int
--- src/sys/arch/arm/rockchip/rk_pwm.c 2021/01/25 14:20:38 1.5
+++ src/sys/arch/arm/rockchip/rk_pwm.c 2021/01/27 02:00:02 1.6
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_pwm.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_pwm.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: rk_pwm.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk_pwm.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -65,7 +65,7 @@
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3288-pwm", .value = PWM_RK3288 },
- { }
+ DEVICE_COMPAT_EOL
};
struct rk_pwm_softc {
--- src/sys/arch/arm/rockchip/rk_v1crypto.c 2021/01/25 14:20:38 1.5
+++ src/sys/arch/arm/rockchip/rk_v1crypto.c 2021/01/27 02:00:02 1.6
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_v1crypto.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_v1crypto.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: rk_v1crypto.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk_v1crypto.c,v 1.6 2021/01/27 02:00:02 thorpej Exp $");
#include <sys/types.h>
@@ -100,7 +100,7 @@
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3288-crypto" },
- { }
+ DEVICE_COMPAT_EOL
};
static int
--- src/sys/arch/arm/rockchip/rk_tsadc.c 2021/01/25 14:20:38 1.10
+++ src/sys/arch/arm/rockchip/rk_tsadc.c 2021/01/27 02:00:02 1.11
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_tsadc.c,v 1.10 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_tsadc.c,v 1.11 2021/01/27 02:00:02 thorpej Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.10 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.11 2021/01/27 02:00:02 thorpej Exp $");
/*
* Driver for the TSADC temperature sensor monitor in RK3328 and RK3399.
@@ -377,7 +377,7 @@
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3328-tsadc", .data = &rk3328_data_table },
{ .compat = "rockchip,rk3399-tsadc", .data = &rk3399_data_table },
- { }
+ DEVICE_COMPAT_EOL
};
#define TSADC_READ(sc, reg) \
--- src/sys/arch/arm/rockchip/rk_usb.c 2021/01/25 14:20:38 1.9
+++ src/sys/arch/arm/rockchip/rk_usb.c 2021/01/27 02:00:02 1.10
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_usb.c,v 1.9 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: rk_usb.c,v 1.10 2021/01/27 02:00:02 thorpej Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.9 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.10 2021/01/27 02:00:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -71,7 +71,7 @@
static const struct device_compatible_entry compat_data[] = {
{ .compat = "rockchip,rk3328-usb2phy", .value = USB_RK3328 },
{ .compat = "rockchip,rk3399-usb2phy", .value = USB_RK3399 },
- { }
+ DEVICE_COMPAT_EOL
};
struct rk_usb_clk {