Module Name: src
Committed By: thorpej
Date: Wed Jan 27 01:49:36 UTC 2021
Modified Files:
src/sys/arch/arm/amlogic: meson_pinctrl.c meson_pwm.c meson_thermal.c
meson_usbctrl.c meson_usbphy.c mesong12_clkc.c mesongx_mmc.c
mesongxbb_clkc.c
Log Message:
Use DEVICE_COMPAT_EOL.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/amlogic/meson_pinctrl.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/meson_pwm.c \
src/sys/arch/arm/amlogic/meson_usbctrl.c \
src/sys/arch/arm/amlogic/mesong12_clkc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/meson_thermal.c \
src/sys/arch/arm/amlogic/meson_usbphy.c \
src/sys/arch/arm/amlogic/mesongxbb_clkc.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/amlogic/mesongx_mmc.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/amlogic/meson_pinctrl.c
diff -u src/sys/arch/arm/amlogic/meson_pinctrl.c:1.9 src/sys/arch/arm/amlogic/meson_pinctrl.c:1.10
--- src/sys/arch/arm/amlogic/meson_pinctrl.c:1.9 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/meson_pinctrl.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_pinctrl.c,v 1.9 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: meson_pinctrl.c,v 1.10 2021/01/27 01:49:36 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_pinctrl.c,v 1.9 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_pinctrl.c,v 1.10 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,7 @@ static const struct device_compatible_en
{ .compat = "amlogic,meson-g12a-periphs-pinctrl",
.data = &mesong12a_periphs_pinctrl_config },
#endif
- { }
+ DEVICE_COMPAT_EOL
};
#define MUX_READ(sc, reg) \
Index: src/sys/arch/arm/amlogic/meson_pwm.c
diff -u src/sys/arch/arm/amlogic/meson_pwm.c:1.3 src/sys/arch/arm/amlogic/meson_pwm.c:1.4
--- src/sys/arch/arm/amlogic/meson_pwm.c:1.3 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/meson_pwm.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_pwm.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: meson_pwm.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $ */
/*
* Copyright (c) 2021 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_pwm.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_pwm.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -69,7 +69,7 @@ static const struct device_compatible_en
{ .compat = "amlogic,meson-g12a-ao-pwm-ab" },
{ .compat = "amlogic,meson-g12a-ao-pwm-cd" },
{ .compat = "amlogic,meson-g12a-ee-pwm" },
- { }
+ DEVICE_COMPAT_EOL
};
#define MESON_PWM_NCHAN 2
Index: src/sys/arch/arm/amlogic/meson_usbctrl.c
diff -u src/sys/arch/arm/amlogic/meson_usbctrl.c:1.3 src/sys/arch/arm/amlogic/meson_usbctrl.c:1.4
--- src/sys/arch/arm/amlogic/meson_usbctrl.c:1.3 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/meson_usbctrl.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_usbctrl.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: meson_usbctrl.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $ */
/*
* Copyright (c) 2021 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_usbctrl.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_usbctrl.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -112,7 +112,7 @@ struct meson_usbctrl_config mesong12_con
static const struct device_compatible_entry compat_data[] = {
{ .compat = "amlogic,meson-g12a-usb-ctrl", .data = &mesong12_conf },
- { }
+ DEVICE_COMPAT_EOL
};
struct meson_usbctrl_softc {
Index: src/sys/arch/arm/amlogic/mesong12_clkc.c
diff -u src/sys/arch/arm/amlogic/mesong12_clkc.c:1.3 src/sys/arch/arm/amlogic/mesong12_clkc.c:1.4
--- src/sys/arch/arm/amlogic/mesong12_clkc.c:1.3 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/mesong12_clkc.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mesong12_clkc.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: mesong12_clkc.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesong12_clkc.c,v 1.3 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesong12_clkc.c,v 1.4 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1492,7 +1492,7 @@ static const struct mesong12_clkc_config
static const struct device_compatible_entry compat_data[] = {
{ .compat = "amlogic,g12a-clkc", .data = &g12a_config },
{ .compat = "amlogic,g12b-clkc", .data = &g12b_config },
- { }
+ DEVICE_COMPAT_EOL
};
CFATTACH_DECL_NEW(mesong12_clkc, sizeof(struct meson_clk_softc),
Index: src/sys/arch/arm/amlogic/meson_thermal.c
diff -u src/sys/arch/arm/amlogic/meson_thermal.c:1.4 src/sys/arch/arm/amlogic/meson_thermal.c:1.5
--- src/sys/arch/arm/amlogic/meson_thermal.c:1.4 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/meson_thermal.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_thermal.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: meson_thermal.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $ */
/*
* Copyright (c) 2021 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_thermal.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_thermal.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -90,7 +90,7 @@ static struct meson_thermal_config therm
static const struct device_compatible_entry compat_data[] = {
{ .compat = "amlogic,g12a-cpu-thermal", .data = &thermal_cpu_conf },
{ .compat = "amlogic,g12a-ddr-thermal", .data = &thermal_ddr_conf },
- { }
+ DEVICE_COMPAT_EOL
};
struct meson_thermal_softc {
Index: src/sys/arch/arm/amlogic/meson_usbphy.c
diff -u src/sys/arch/arm/amlogic/meson_usbphy.c:1.4 src/sys/arch/arm/amlogic/meson_usbphy.c:1.5
--- src/sys/arch/arm/amlogic/meson_usbphy.c:1.4 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/meson_usbphy.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_usbphy.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: meson_usbphy.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_usbphy.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_usbphy.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -65,7 +65,7 @@ static const struct device_compatible_en
{ .compat = "amlogic,meson-gxbb-usb2-phy",
.value = USBPHY_MESON8B },
- { }
+ DEVICE_COMPAT_EOL
};
struct meson_usbphy_softc {
Index: src/sys/arch/arm/amlogic/mesongxbb_clkc.c
diff -u src/sys/arch/arm/amlogic/mesongxbb_clkc.c:1.4 src/sys/arch/arm/amlogic/mesongxbb_clkc.c:1.5
--- src/sys/arch/arm/amlogic/mesongxbb_clkc.c:1.4 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/mesongxbb_clkc.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongxbb_clkc.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: mesongxbb_clkc.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: mesongxbb_clkc.c,v 1.4 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mesongxbb_clkc.c,v 1.5 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -81,7 +81,7 @@ static const struct mesongxbb_clkc_confi
static const struct device_compatible_entry compat_data[] = {
{ .compat = "amlogic,gxbb-clkc", .data = &gxbb_config },
{ .compat = "amlogic,gxl-clkc", .data = &gxl_config },
- { }
+ DEVICE_COMPAT_EOL
};
CFATTACH_DECL_NEW(mesongxbb_clkc, sizeof(struct meson_clk_softc),
Index: src/sys/arch/arm/amlogic/mesongx_mmc.c
diff -u src/sys/arch/arm/amlogic/mesongx_mmc.c:1.11 src/sys/arch/arm/amlogic/mesongx_mmc.c:1.12
--- src/sys/arch/arm/amlogic/mesongx_mmc.c:1.11 Mon Jan 25 14:20:37 2021
+++ src/sys/arch/arm/amlogic/mesongx_mmc.c Wed Jan 27 01:49:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.11 2021/01/25 14:20:37 thorpej Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.12 2021/01/27 01:49:36 thorpej Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.11 2021/01/25 14:20:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.12 2021/01/27 01:49:36 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -271,7 +271,7 @@ static const struct device_compatible_en
{ .compat = "amlogic,meson-gx-mmc", .value = MESONGX_MMC_V2 },
{ .compat = "amlogic,meson-gxbb-mmc", .value = MESONGX_MMC_V2 },
{ .compat = "amlogic,meson-axg-mmc", .value = MESONGX_MMC_V3 },
- { }
+ DEVICE_COMPAT_EOL
};
static int
