ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
63 lines
3.3 KiB
Diff
63 lines
3.3 KiB
Diff
From 7ff112c7b144fb084f28f944d7021cd04acabecd Mon Sep 17 00:00:00 2001
|
|
From: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Date: Fri, 12 Jul 2019 08:02:59 +0000
|
|
Subject: [PATCH] can: flexcan: add imx8qm support
|
|
|
|
The Flexcan on i.MX8QM supports CAN FD protocol.
|
|
|
|
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 26 +++++++++++++++++---------
|
|
1 file changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -200,15 +200,16 @@
|
|
/* FLEXCAN hardware feature flags
|
|
*
|
|
* Below is some version info we got:
|
|
- * SOC Version IP-Version Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-
|
|
- * Filter? connected? Passive detection ception in MB
|
|
- * MX25 FlexCAN2 03.00.00.00 no no no no no
|
|
- * MX28 FlexCAN2 03.00.04.00 yes yes no no no
|
|
- * MX35 FlexCAN2 03.00.00.00 no no no no no
|
|
- * MX53 FlexCAN2 03.00.00.00 yes no no no no
|
|
- * MX6s FlexCAN3 10.00.12.00 yes yes no no yes
|
|
- * VF610 FlexCAN3 ? no yes no yes yes?
|
|
- * LS1021A FlexCAN2 03.00.04.00 no yes no no yes
|
|
+ * SOC Version IP-Version Glitch- [TR]WRN_INT IRQ Err Memory err RTR rece- FD Mode
|
|
+ * Filter? connected? Passive detection ption in MB Supported?
|
|
+ * MX25 FlexCAN2 03.00.00.00 no no no no no no
|
|
+ * MX28 FlexCAN2 03.00.04.00 yes yes no no no no
|
|
+ * MX35 FlexCAN2 03.00.00.00 no no no no no no
|
|
+ * MX53 FlexCAN2 03.00.00.00 yes no no no no no
|
|
+ * MX6s FlexCAN3 10.00.12.00 yes yes no no yes no
|
|
+ * MX8QM FlexCAN3 03.00.23.00 yes yes no no yes yes
|
|
+ * VF610 FlexCAN3 ? no yes no yes yes? no
|
|
+ * LS1021A FlexCAN2 03.00.04.00 no yes no no yes no
|
|
*
|
|
* Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
|
|
*/
|
|
@@ -347,6 +348,12 @@ static const struct flexcan_devtype_data
|
|
FLEXCAN_QUIRK_SETUP_STOP_MODE,
|
|
};
|
|
|
|
+static struct flexcan_devtype_data fsl_imx8qm_devtype_data = {
|
|
+ .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
|
|
+ FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
|
|
+ FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD,
|
|
+};
|
|
+
|
|
static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
|
|
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
|
|
FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
|
|
@@ -1775,6 +1782,7 @@ out_put_node:
|
|
}
|
|
|
|
static const struct of_device_id flexcan_of_match[] = {
|
|
+ { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
|
|
{ .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
|
|
{ .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, },
|
|
{ .compatible = "fsl,imx53-flexcan", .data = &fsl_imx25_devtype_data, },
|