Module Name: src
Committed By: bouyer
Date: Thu May 4 13:29:33 UTC 2023
Modified Files:
src/sys/arch/arm/nxp: imx6_gpc.c imx6_iomux.c imx6_pcie.c imx6_spi.c
imx6_usb.c imx6_usbphy.c imx_sdhc.c
Log Message:
Add i.mx6sx compatible entries to drivers that should work as is.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_gpc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_iomux.c \
src/sys/arch/arm/nxp/imx6_usbphy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nxp/imx6_pcie.c \
src/sys/arch/arm/nxp/imx6_usb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_spi.c \
src/sys/arch/arm/nxp/imx_sdhc.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/imx6_gpc.c
diff -u src/sys/arch/arm/nxp/imx6_gpc.c:1.3 src/sys/arch/arm/nxp/imx6_gpc.c:1.4
--- src/sys/arch/arm/nxp/imx6_gpc.c:1.3 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_gpc.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_gpc.c,v 1.3 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_gpc.c,v 1.4 2023/05/04 13:29:33 bouyer Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.3 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.4 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_fdt.h"
@@ -66,6 +66,7 @@ CFATTACH_DECL_NEW(imxgpc, sizeof(struct
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-gpc" },
+ { .compat = "fsl,imx6sx-gpc" },
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/nxp/imx6_iomux.c
diff -u src/sys/arch/arm/nxp/imx6_iomux.c:1.2 src/sys/arch/arm/nxp/imx6_iomux.c:1.3
--- src/sys/arch/arm/nxp/imx6_iomux.c:1.2 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_iomux.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_iomux.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_iomux.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_iomux.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_iomux.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_fdt.h"
@@ -131,6 +131,7 @@ CFATTACH_DECL_NEW(imxiomux, sizeof(struc
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-iomuxc" },
+ { .compat = "fsl,imx6sx-iomuxc" },
{ .compat = "fsl,imx7d-iomuxc" },
{ .compat = "fsl,imx8mq-iomuxc" },
DEVICE_COMPAT_EOL
Index: src/sys/arch/arm/nxp/imx6_usbphy.c
diff -u src/sys/arch/arm/nxp/imx6_usbphy.c:1.2 src/sys/arch/arm/nxp/imx6_usbphy.c:1.3
--- src/sys/arch/arm/nxp/imx6_usbphy.c:1.2 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_usbphy.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usbphy.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_usbphy.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_fdt.h"
@@ -63,6 +63,7 @@ CFATTACH_DECL_NEW(imxusbphy, sizeof(stru
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-usbphy" },
+ { .compat = "fsl,imx6sx-usbphy" },
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/nxp/imx6_pcie.c
diff -u src/sys/arch/arm/nxp/imx6_pcie.c:1.6 src/sys/arch/arm/nxp/imx6_pcie.c:1.7
--- src/sys/arch/arm/nxp/imx6_pcie.c:1.6 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_pcie.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_pcie.c,v 1.6 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_pcie.c,v 1.7 2023/05/04 13:29:33 bouyer 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.6 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_pci.h"
#include "opt_fdt.h"
@@ -92,6 +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 },
+ { .compat = "fsl,imx6sx-pcie", .value = true },
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/nxp/imx6_usb.c
diff -u src/sys/arch/arm/nxp/imx6_usb.c:1.6 src/sys/arch/arm/nxp/imx6_usb.c:1.7
--- src/sys/arch/arm/nxp/imx6_usb.c:1.6 Sat Aug 7 16:18:45 2021
+++ src/sys/arch/arm/nxp/imx6_usb.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usb.c,v 1.6 2021/08/07 16:18:45 thorpej Exp $ */
+/* $NetBSD: imx6_usb.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.6 2021/08/07 16:18:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_fdt.h"
@@ -75,6 +75,7 @@ CFATTACH_DECL_NEW(imxusbc_fdt, sizeof(st
static const struct device_compatible_entry compat_data[] = {
{ .compat = "fsl,imx6q-usb" },
+ { .compat = "fsl,imx6sx-usb" },
{ .compat = "fsl,imx7d-usb" },
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/nxp/imx6_spi.c
diff -u src/sys/arch/arm/nxp/imx6_spi.c:1.7 src/sys/arch/arm/nxp/imx6_spi.c:1.8
--- src/sys/arch/arm/nxp/imx6_spi.c:1.7 Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_spi.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_spi.c,v 1.7 2021/01/27 03:10:20 thorpej Exp $ */
+/* $NetBSD: imx6_spi.c,v 1.8 2023/05/04 13:29:33 bouyer 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.7 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_spi.c,v 1.8 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_imxspi.h"
@@ -62,6 +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 },
+ { .compat = "fsl,imx6sx-ecspi", .data = &imx6q_spi_config },
DEVICE_COMPAT_EOL
};
Index: src/sys/arch/arm/nxp/imx_sdhc.c
diff -u src/sys/arch/arm/nxp/imx_sdhc.c:1.7 src/sys/arch/arm/nxp/imx_sdhc.c:1.8
--- src/sys/arch/arm/nxp/imx_sdhc.c:1.7 Sun Feb 6 15:52:20 2022
+++ src/sys/arch/arm/nxp/imx_sdhc.c Thu May 4 13:29:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: imx_sdhc.c,v 1.7 2022/02/06 15:52:20 jmcneill Exp $ */
+/* $NetBSD: imx_sdhc.c,v 1.8 2023/05/04 13:29:33 bouyer 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.7 2022/02/06 15:52:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_sdhc.c,v 1.8 2023/05/04 13:29:33 bouyer Exp $");
#include "opt_fdt.h"
@@ -86,6 +86,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,imx6sx-usdhc", .data = &imx6q_config },
{ .compat = "fsl,imx7d-usdhc", .data = &imx7d_config },
DEVICE_COMPAT_EOL
};
