diff options
| author | John Audia <graysky@archlinux.us> | 2020-11-24 11:34:10 -0500 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-11-26 11:17:55 +0100 |
| commit | 4e39949dd1f7eb706d857e1c44a992ae752132a7 (patch) | |
| tree | be33a7528f700766af7dda05afdaaf1f018fd127 /target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch | |
| parent | f29231ece747dc09c350aea90bd30d1ab6447a4a (diff) | |
| download | openwrt-4e39949dd1f7eb706d857e1c44a992ae752132a7.tar.gz openwrt-4e39949dd1f7eb706d857e1c44a992ae752132a7.tar.bz2 openwrt-4e39949dd1f7eb706d857e1c44a992ae752132a7.zip | |
kernel: bump 5.4 to 5.4.80
Removed since could be reverse-applied by quilt and found to be
included upstream:
backport-5.4/789-net-usb-qmi_wwan-Set-DTR-quirk-for-MR400.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, bcm27xx/bcm2711, ath79/generic
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-by: Curtis Deptuck <curtdept@me.com> [x86_64 build/run]
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch index 890c9a9991..c88f14f01f 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch @@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c -@@ -783,16 +783,23 @@ static inline struct flexcan_priv *rx_of +@@ -785,16 +785,23 @@ static inline struct flexcan_priv *rx_of return container_of(offload, struct flexcan_priv, offload); } @@ -52,7 +52,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> mb = flexcan_get_mb(priv, n); if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) { -@@ -806,7 +813,7 @@ static unsigned int flexcan_mailbox_read +@@ -808,7 +815,7 @@ static unsigned int flexcan_mailbox_read code = reg_ctrl & FLEXCAN_MB_CODE_MASK; if ((code != FLEXCAN_MB_CODE_RX_FULL) && (code != FLEXCAN_MB_CODE_RX_OVERRUN)) @@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> if (code == FLEXCAN_MB_CODE_RX_OVERRUN) { /* This MB was overrun, we lost data */ -@@ -816,11 +823,17 @@ static unsigned int flexcan_mailbox_read +@@ -818,11 +825,17 @@ static unsigned int flexcan_mailbox_read } else { reg_iflag1 = priv->read(®s->iflag1); if (!(reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE)) @@ -80,7 +80,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> /* increase timstamp to full 32 bit */ *timestamp = reg_ctrl << 16; -@@ -839,7 +852,7 @@ static unsigned int flexcan_mailbox_read +@@ -841,7 +854,7 @@ static unsigned int flexcan_mailbox_read *(__be32 *)(cf->data + i) = data; } @@ -89,7 +89,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) { /* Clear IRQ */ if (n < 32) -@@ -856,7 +869,7 @@ static unsigned int flexcan_mailbox_read +@@ -858,7 +871,7 @@ static unsigned int flexcan_mailbox_read */ priv->read(®s->timer); |