kernel: bump 5.4 to 5.4.109

[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 c3c43394ff31cd184631ca517adf172d3e1fbfd0..29104bd14efcbe502aaeab35ab5fec0c85f4f50a 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
@@ -126,7 +126,7 @@ Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
  
  
        reg_mcr = priv->read(&regs->mcr);
-@@ -1776,11 +1820,6 @@ static int flexcan_setup_stop_mode(struc
+@@ -1782,11 +1826,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:
-@@ -1788,6 +1827,30 @@ out_put_node:
+@@ -1794,6 +1833,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, },
-@@ -1930,9 +1993,19 @@ static int flexcan_probe(struct platform
+@@ -1936,9 +1999,19 @@ static int flexcan_probe(struct platform
        devm_can_led_init(dev);
  
        if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) {