kernel: bump 5.4 to 5.4.110

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch b/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
index f8ea7255122d681b496348b5db3867668ff87fe1..ce0102182f719d655e144e97ae7d170c41175892 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0011-can-flexcan-rename-struct-flexcan_priv-reg_imask-1-2.patch
@@ -49,7 +49,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        struct clk *clk_ipg;
        struct clk *clk_per;
-@@ -879,9 +879,9 @@ static inline u64 flexcan_read_reg_iflag
+@@ -886,9 +886,9 @@ static inline u64 flexcan_read_reg_iflag
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 iflag1, iflag2;
  
@@ -61,7 +61,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        return (u64)iflag2 << 32 | iflag1;
  }
-@@ -1228,8 +1228,8 @@ static int flexcan_chip_start(struct net
+@@ -1233,8 +1233,8 @@ static int flexcan_chip_start(struct net
        /* enable interrupts atomically */
        disable_irq(dev->irq);
        priv->write(priv->reg_ctrl_default, &regs->ctrl);
@@ -72,7 +72,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        enable_irq(dev->irq);
  
        /* print chip status */
-@@ -1320,8 +1320,8 @@ static int flexcan_open(struct net_devic
+@@ -1328,8 +1328,8 @@ static int flexcan_open(struct net_devic
        priv->tx_mb_idx = priv->mb_count - 1;
        priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
@@ -83,7 +83,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        priv->offload.mailbox_read = flexcan_mailbox_read;
  
-@@ -1333,12 +1333,12 @@ static int flexcan_open(struct net_devic
+@@ -1341,12 +1341,12 @@ static int flexcan_open(struct net_devic
  
                imask = GENMASK_ULL(priv->offload.mb_last,
                                    priv->offload.mb_first);