kernel: bump 5.4 to 5.4.106

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch b/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
index 1b0c2115cc2418e6049849515c05e61adbc43169..d8b9b1e5d696524477474e142498da2be8d93f89 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0019-can-flexcan-add-CAN-FD-mode-support.patch
@@ -324,7 +324,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        u64 reg_imask;
        int err, i;
        struct flexcan_mb __iomem *mb;
-@@ -1164,6 +1312,26 @@ static int flexcan_chip_start(struct net
+@@ -1166,6 +1314,26 @@ static int flexcan_chip_start(struct net
        netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);
        priv->write(reg_ctrl, &regs->ctrl);
  
@@ -351,7 +351,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
                reg_ctrl2 = priv->read(&regs->ctrl2);
                reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;
-@@ -1304,6 +1472,12 @@ static int flexcan_open(struct net_devic
+@@ -1306,6 +1474,12 @@ static int flexcan_open(struct net_devic
        struct flexcan_priv *priv = netdev_priv(dev);
        int err;
  
@@ -364,7 +364,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        err = pm_runtime_get_sync(priv->dev);
        if (err < 0) {
                pm_runtime_put_noidle(priv->dev);
-@@ -1322,7 +1496,10 @@ static int flexcan_open(struct net_devic
+@@ -1324,7 +1498,10 @@ static int flexcan_open(struct net_devic
        if (err)
                goto out_transceiver_disable;
  
@@ -376,7 +376,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        priv->mb_count = (sizeof(priv->regs->mb[0]) / priv->mb_size) +
                         (sizeof(priv->regs->mb[1]) / priv->mb_size);
  
-@@ -1670,6 +1847,18 @@ static int flexcan_probe(struct platform
+@@ -1676,6 +1853,18 @@ static int flexcan_probe(struct platform
        priv->devtype_data = devtype_data;
        priv->reg_xceiver = reg_xceiver;