kernel: bump 5.4 to 5.4.80

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch b/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
index 5286e4b11b41335d0ec6c42fae5b3905514663ce..03b717d283e6cacd8f92043530db2cfc92250172 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0016-can-flexcan-flexcan_irq-add-support-for-TX-mailbox-i.patch
@@ -28,7 +28,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 --- a/drivers/net/can/flexcan.c
 +++ b/drivers/net/can/flexcan.c
-@@ -790,11 +790,24 @@ static inline u64 flexcan_read64_mask(st
+@@ -792,11 +792,24 @@ static inline u64 flexcan_read64_mask(st
        return reg & mask;
  }
  
@@ -53,7 +53,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  {
        return container_of(offload, struct flexcan_priv, offload);
-@@ -931,7 +944,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -933,7 +946,7 @@ static irqreturn_t flexcan_irq(int irq,
                }
        }
  
@@ -62,7 +62,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        /* transmission complete interrupt */
        if (reg_iflag_tx & priv->tx_mask) {
-@@ -946,7 +959,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -948,7 +961,7 @@ static irqreturn_t flexcan_irq(int irq,
                /* after sending a RTR frame MB is in RX mode */
                priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
                            &priv->tx_mb->can_ctrl);