Module Name: src
Committed By: thorpej
Date: Wed Jan 27 02:14:49 UTC 2021
Modified Files:
src/sys/arch/arm/nxp: if_enet_imx.c imx6_pcie.c imx6_spi.c
imx8mq_usbphy.c imx_sdhc.c
Log Message:
Use DEVICE_COMPAT_EOL.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nxp/if_enet_imx.c \
src/sys/arch/arm/nxp/imx6_pcie.c src/sys/arch/arm/nxp/imx_sdhc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nxp/imx6_spi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx8mq_usbphy.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/nxp/if_enet_imx.c
diff -u src/sys/arch/arm/nxp/if_enet_imx.c:1.4 src/sys/arch/arm/nxp/if_enet_imx.c:1.5
--- src/sys/arch/arm/nxp/if_enet_imx.c:1.4 Mon Jan 25 14:20:38 2021
+++ src/sys/arch/arm/nxp/if_enet_imx.c Wed Jan 27 02:14:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet_imx.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: if_enet_imx.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
#include "opt_fdt.h"
@@ -53,7 +53,7 @@ static const struct device_compatible_en
/* compatible imxtype */
{ .compat = "fsl,imx6q-fec", .value = 6 },
{ .compat = "fsl,imx6sx-fec", .value = 7 },
- { }
+ DEVICE_COMPAT_EOL
};
static int enet_init_clocks(struct enet_softc *);
Index: src/sys/arch/arm/nxp/imx6_pcie.c
diff -u src/sys/arch/arm/nxp/imx6_pcie.c:1.4 src/sys/arch/arm/nxp/imx6_pcie.c:1.5
--- src/sys/arch/arm/nxp/imx6_pcie.c:1.4 Mon Jan 25 14:20:38 2021
+++ src/sys/arch/arm/nxp/imx6_pcie.c Wed Jan 27 02:14:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_pcie.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: imx6_pcie.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
#include "opt_pci.h"
#include "opt_fdt.h"
@@ -92,7 +92,7 @@ CFATTACH_DECL_NEW(imxpcie_fdt, sizeof(st
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-pcie", .value = false },
{ .compat = "fsl,imx6qp-pcie", .value = true },
- { }
+ DEVICE_COMPAT_EOL
};
static int
Index: src/sys/arch/arm/nxp/imx_sdhc.c
diff -u src/sys/arch/arm/nxp/imx_sdhc.c:1.4 src/sys/arch/arm/nxp/imx_sdhc.c:1.5
--- src/sys/arch/arm/nxp/imx_sdhc.c:1.4 Mon Jan 25 14:20:38 2021
+++ src/sys/arch/arm/nxp/imx_sdhc.c Wed Jan 27 02:14:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx_sdhc.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: imx_sdhc.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx_sdhc.c,v 1.4 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_sdhc.c,v 1.5 2021/01/27 02:14:49 thorpej Exp $");
#include "opt_fdt.h"
@@ -87,7 +87,7 @@ static const struct imx6_sdhc_config imx
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-usdhc", .data = &imx6q_config },
{ .compat = "fsl,imx7d-usdhc", .data = &imx7d_config },
- { }
+ DEVICE_COMPAT_EOL
};
static int
Index: src/sys/arch/arm/nxp/imx6_spi.c
diff -u src/sys/arch/arm/nxp/imx6_spi.c:1.5 src/sys/arch/arm/nxp/imx6_spi.c:1.6
--- src/sys/arch/arm/nxp/imx6_spi.c:1.5 Mon Jan 25 14:20:38 2021
+++ src/sys/arch/arm/nxp/imx6_spi.c Wed Jan 27 02:14:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_spi.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: imx6_spi.c,v 1.6 2021/01/27 02:14:49 thorpej Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.5 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.6 2021/01/27 02:14:49 thorpej Exp $");
#include "opt_imxspi.h"
@@ -62,7 +62,7 @@ static const struct imx_spi_config imx6q
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-ecspi", .data = &imx6q_spi_config },
- { }
+ DEVICE_COMPAT_EOL
};
CFATTACH_DECL_NEW(imxspi_fdt, sizeof(struct imxspi_fdt_softc),
Index: src/sys/arch/arm/nxp/imx8mq_usbphy.c
diff -u src/sys/arch/arm/nxp/imx8mq_usbphy.c:1.3 src/sys/arch/arm/nxp/imx8mq_usbphy.c:1.4
--- src/sys/arch/arm/nxp/imx8mq_usbphy.c:1.3 Mon Jan 25 14:20:38 2021
+++ src/sys/arch/arm/nxp/imx8mq_usbphy.c Wed Jan 27 02:14:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx8mq_usbphy.c,v 1.3 2021/01/25 14:20:38 thorpej Exp $ */
+/* $NetBSD: imx8mq_usbphy.c,v 1.4 2021/01/27 02:14:49 thorpej Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx8mq_usbphy.c,v 1.3 2021/01/25 14:20:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx8mq_usbphy.c,v 1.4 2021/01/27 02:14:49 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -57,7 +57,7 @@ static void imx8mq_usbphy_attach(device_
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx8mq-usb-phy" },
- { }
+ DEVICE_COMPAT_EOL
};
struct imx8mq_usbphy_softc {