kernel: bump 5.4 to 5.4.106

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

diff --git a/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch b/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
index 5357b57893f479dcfa1626a5a37f03bc572d5cec..3ff0d65d11d9e36639b3cfa58af051be47738a50 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0021-can-flexcan-add-ISO-CAN-FD-feature-support.patch
@@ -31,7 +31,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
  /* FLEXCAN memory error control register (MECR) bits */
  #define FLEXCAN_MECR_ECRWRDIS         BIT(31)
-@@ -1324,6 +1325,7 @@ static int flexcan_chip_start(struct net
+@@ -1326,6 +1327,7 @@ static int flexcan_chip_start(struct net
                reg_fdctrl = priv->read(&regs->fdctrl) & ~FLEXCAN_FDCTRL_FDRATE;
                reg_fdctrl &= ~(FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3));
                reg_mcr = priv->read(&regs->mcr) & ~FLEXCAN_MCR_FDEN;
@@ -39,7 +39,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  
                /* support BRS when set CAN FD mode
                 * 64 bytes payload per MB and 7 MBs per RAM block by default
-@@ -1333,10 +1335,14 @@ static int flexcan_chip_start(struct net
+@@ -1335,10 +1337,14 @@ static int flexcan_chip_start(struct net
                        reg_fdctrl |= FLEXCAN_FDCTRL_FDRATE;
                        reg_fdctrl |= FLEXCAN_FDCTRL_MBDSR1(0x3) | FLEXCAN_FDCTRL_MBDSR0(0x3);
                        reg_mcr |= FLEXCAN_MCR_FDEN;
@@ -54,7 +54,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
        }
  
        if ((priv->devtype_data->quirks & FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {
-@@ -1856,7 +1862,7 @@ static int flexcan_probe(struct platform
+@@ -1862,7 +1868,7 @@ static int flexcan_probe(struct platform
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_TIMESTAMP_SUPPORT_FD) {
                if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {