kernel: bump 5.4 to 5.4.110

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch b/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
index 7efa29e1d00978231d7806c2f3528569d394c5cb..26dbb02c7956f09d8c1b30a883f8efd6595a2da4 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0022-can-flexcan-add-Transceiver-Delay-Compensation-suopp.patch
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN FD Bit Timing register (FDCBT) bits */
  #define FLEXCAN_FDCBT_FPRESDIV(x)     (((x) & 0x3ff) << 20)
-@@ -1102,7 +1105,7 @@ static void flexcan_set_bittiming(struct
+@@ -1108,7 +1111,7 @@ static void flexcan_set_bittiming(struct
        struct can_bittiming *bt = &priv->can.bittiming;
        struct can_bittiming *dbt = &priv->can.data_bittiming;
        struct flexcan_regs __iomem *regs = priv->regs;
@@ -40,7 +40,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
        reg = priv->read(&regs->ctrl);
        reg &= ~(FLEXCAN_CTRL_LPB | FLEXCAN_CTRL_SMP | FLEXCAN_CTRL_LOM);
-@@ -1174,6 +1177,19 @@ static void flexcan_set_bittiming(struct
+@@ -1180,6 +1183,19 @@ static void flexcan_set_bittiming(struct
                                        FLEXCAN_FDCBT_FPROPSEG(dbt->prop_seg);
                        priv->write(reg_fdcbt, &regs->fdcbt);
  
@@ -60,7 +60,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
                        if (bt->brp != dbt->brp)
                                netdev_warn(dev, "Warning!! data brp = %d and brp = %d don't match.\n"
                                            "flexcan may not work. consider using different bitrate or data bitrate\n",
-@@ -1325,6 +1341,7 @@ static int flexcan_chip_start(struct net
+@@ -1331,6 +1347,7 @@ static int flexcan_chip_start(struct net
        /* FDCTRL */
        if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) {
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;