mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
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>
46 lines
2.1 KiB
Diff
46 lines
2.1 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_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
|
|
@@ -1791,6 +1798,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);
|