mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
b4c02c9998
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>
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 3e13fca177e84f94ce691fb90f36086812972eff Mon Sep 17 00:00:00 2001
|
|
From: Pankaj Bansal <pankaj.bansal@nxp.com>
|
|
Date: Fri, 12 Jul 2019 08:03:01 +0000
|
|
Subject: [PATCH] can: flexcan: add lx2160ar1 support
|
|
|
|
The Flexcan on lx2160ar1 supports CAN FD protocol.
|
|
|
|
signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
|
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -210,6 +210,7 @@
|
|
* 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
|
|
+ * LX2160A FlexCAN3 03.00.23.00 no yes no no yes yes
|
|
*
|
|
* Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
|
|
*/
|
|
@@ -360,6 +361,12 @@ static const struct flexcan_devtype_data
|
|
FLEXCAN_QUIRK_BROKEN_PERR_STATE,
|
|
};
|
|
|
|
+static const struct flexcan_devtype_data fsl_lx2160a_r1_devtype_data = {
|
|
+ .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
|
|
+ FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
|
|
+ FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD,
|
|
+};
|
|
+
|
|
static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {
|
|
.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
|
|
FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |
|
|
@@ -1776,6 +1783,7 @@ static const struct of_device_id flexcan
|
|
{ .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, },
|
|
{ .compatible = "fsl,vf610-flexcan", .data = &fsl_vf610_devtype_data, },
|
|
{ .compatible = "fsl,ls1021ar2-flexcan", .data = &fsl_ls1021a_r2_devtype_data, },
|
|
+ { .compatible = "fsl,lx2160ar1-flexcan", .data = &fsl_lx2160a_r1_devtype_data, },
|
|
{ /* sentinel */ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, flexcan_of_match);
|