kernel: bump 5.4 to 5.4.79

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch

diff --git a/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch b/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
index 06fd55aaa894b76dd139e40bed7a5ed8ee25e591..d7e40d5463b8a59731ca4d17b004e40c0f5627fb 100644 (file)
--- a/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch
@@ -63,7 +63,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  };
  
  static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
-@@ -504,6 +516,32 @@ static void flexcan_enable_wakeup_irq(st
+@@ -503,6 +515,32 @@ static void flexcan_enable_wakeup_irq(st
        priv->write(reg_mcr, &regs->mcr);
  }
  
@@ -96,7 +96,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv)
  {
        struct flexcan_regs __iomem *regs = priv->regs;
-@@ -513,9 +551,12 @@ static inline int flexcan_enter_stop_mod
+@@ -512,9 +550,12 @@ static inline int flexcan_enter_stop_mod
        reg_mcr |= FLEXCAN_MCR_SLF_WAK;
        priv->write(reg_mcr, &regs->mcr);
  
@@ -112,7 +112,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
        return flexcan_low_power_enter_ack(priv);
  }
-@@ -526,8 +567,11 @@ static inline int flexcan_exit_stop_mode
+@@ -525,8 +566,11 @@ static inline int flexcan_exit_stop_mode
        u32 reg_mcr;
  
        /* remove stop request */
@@ -126,7 +126,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  
        reg_mcr = priv->read(&regs->mcr);
-@@ -1767,11 +1811,6 @@ static int flexcan_setup_stop_mode(struc
+@@ -1766,11 +1810,6 @@ static int flexcan_setup_stop_mode(struc
                gpr_np->full_name, priv->stm.req_gpr, priv->stm.req_bit,
                priv->stm.ack_gpr, priv->stm.ack_bit);
  
@@ -138,7 +138,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
        return 0;
  
  out_put_node:
-@@ -1779,6 +1818,30 @@ out_put_node:
+@@ -1778,6 +1817,30 @@ out_put_node:
        return ret;
  }
  
@@ -169,7 +169,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  static const struct of_device_id flexcan_of_match[] = {
        { .compatible = "fsl,imx8qm-flexcan", .data = &fsl_imx8qm_devtype_data, },
        { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, },
-@@ -1921,9 +1984,19 @@ static int flexcan_probe(struct platform
+@@ -1920,9 +1983,19 @@ static int flexcan_probe(struct platform
        devm_can_led_init(dev);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {