2020-04-10 02:47:05 +00:00
|
|
|
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 |
|
kernel: bump 5.4 to 5.4.73
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-10-31 11:35:12 +00:00
|
|
|
@@ -1760,6 +1767,7 @@ out_put_node:
|
2020-04-10 02:47:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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, },
|