diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
| commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
| tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch | |
| parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
| download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip | |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch b/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch new file mode 100644 index 0000000000..569026398e --- /dev/null +++ b/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch @@ -0,0 +1,62 @@ +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 | +@@ -1738,6 +1745,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, }, |