mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
9100566267
Manually rebased patches: ath79/patches-5.4/910-unaligned_access_hacks.patch bcm27xx/patches-5.4/950-0135-spi-spi-bcm2835-Disable-forced-software-CS.patch bcm27xx/patches-5.4/950-0414-SQUASH-Fix-spi-driver-compiler-warnings.patch ipq806x/patches-5.4/093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch Removed since could be reverse-applied by quilt and found to be included upstream: ipq806x/patches-5.4/096-PCI-qcom-Make-sure-PCIe-is-reset-before-init-for-rev.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [refresh altered targets after rebase] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 6340760d0671e92b15ff92b7eda41bbdd9702437 Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Fri, 1 Mar 2019 16:27:59 +0100
|
|
Subject: [PATCH] can: flexcan: flexcan_mailbox_read() make use of
|
|
flexcan_write64() to mark the mailbox as read
|
|
|
|
In the previous patch the function flexcan_write64() was introduced.
|
|
|
|
This patch replaces the open coded variant in flexcan_mailbox_read()
|
|
that marks a mailbox as read, by a single call to flexcan_write64().
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/flexcan.c | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/can/flexcan.c
|
|
+++ b/drivers/net/can/flexcan.c
|
|
@@ -883,15 +883,10 @@ static struct sk_buff *flexcan_mailbox_r
|
|
}
|
|
|
|
mark_as_read:
|
|
- if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {
|
|
- /* Clear IRQ */
|
|
- if (n < 32)
|
|
- priv->write(BIT(n), ®s->iflag1);
|
|
- else
|
|
- priv->write(BIT(n - 32), ®s->iflag2);
|
|
- } else {
|
|
+ if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)
|
|
+ flexcan_write64(priv, FLEXCAN_IFLAG_MB(n), ®s->iflag1);
|
|
+ else
|
|
priv->write(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, ®s->iflag1);
|
|
- }
|
|
|
|
/* Read the Free Running Timer. It is optional but recommended
|
|
* to unlock Mailbox as soon as possible and make it available
|