mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 22:18:16 +02: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] 9b1b89229f0e ("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>
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From 6a892e9147ff5b6a21a752326841869427068f01 Mon Sep 17 00:00:00 2001
|
|
From: Chircu-Mare Bogdan-Petru <Bogdan.Chircu@freescale.com>
|
|
Date: Tue, 3 Nov 2015 17:25:46 +0200
|
|
Subject: [PATCH] can: flexcan: Add S32V234 support to FlexCAN driver
|
|
|
|
The FlexCAN driver is compatible with the modules on S32V234 chips.
|
|
|
|
Signed-off-by: Chircu-Mare Bogdan-Petru <Bogdan.Chircu@freescale.com>
|
|
Signed-off-by: Dan Nica <dan.nica@nxp.com>
|
|
Signed-off-by: Stefan-Gabriel Mirea <stefan-gabriel.mirea@nxp.com>
|
|
Reviewed-by: Li Yang <leoyang.li@nxp.com>
|
|
Reviewed-by: Joakim Zhang <qiangqing.zhang@nxp.com>
|
|
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
|
|
---
|
|
drivers/net/can/flexcan.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -6,6 +6,7 @@
|
|
// Copyright (c) 2009 Sascha Hauer, Pengutronix
|
|
// Copyright (c) 2010-2017 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de>
|
|
// Copyright (c) 2014 David Jander, Protonic Holland
|
|
+// Copyright 2015, 2018 NXP
|
|
//
|
|
// Based on code originally by Andrey Volkov <avolkov@varma-el.com>
|
|
|
|
@@ -384,6 +385,10 @@ static const struct flexcan_devtype_data
|
|
FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
|
|
};
|
|
|
|
+static struct flexcan_devtype_data fsl_s32v234_devtype_data = {
|
|
+ .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_DISABLE_MECR,
|
|
+};
|
|
+
|
|
static const struct can_bittiming_const flexcan_bittiming_const = {
|
|
.name = DRV_NAME,
|
|
.tseg1_min = 4,
|
|
@@ -1868,6 +1873,8 @@ static const struct of_device_id flexcan
|
|
{ .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, },
|
|
+ { .compatible = "fsl,s32v234-flexcan",
|
|
+ .data = &fsl_s32v234_devtype_data, },
|
|
{ /* sentinel */ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, flexcan_of_match);
|