aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-03-30 10:52:07 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-04-02 16:45:28 +0200
commitec6293febc244d187e71a6e54f44920be679cde4 (patch)
treeeef61941fd6caa9c36ecdd369a37d9383cbff6a8 /target/linux/layerscape/patches-5.4/802-can-0023-can-flexcan-add-imx8qm-support.patch
parent209c5918b511d9e406a094ba246a985b640e519f (diff)
downloadupstream-ec6293febc244d187e71a6e54f44920be679cde4.tar.gz
upstream-ec6293febc244d187e71a6e54f44920be679cde4.tar.bz2
upstream-ec6293febc244d187e71a6e54f44920be679cde4.zip
kernel: bump 5.4 to 5.4.109
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>
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.patch2
1 files changed, 1 insertions, 1 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
index aacf2782e0..16a224faf0 100644
--- 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
@@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
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 |
-@@ -1769,6 +1776,7 @@ out_put_node:
+@@ -1775,6 +1782,7 @@ out_put_node:
}
static const struct of_device_id flexcan_of_match[] = {