diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-03-24 21:47:36 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-03-27 16:26:56 +0100 |
| commit | 2464a9a8a4a3c7b4a0cb63db42b9906a0297979a (patch) | |
| tree | 3259691b8c14d1e3ffe56676868711985590f68b /target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch | |
| parent | e8cbdbbe97d55b77062a3d80f42c87cb761e9729 (diff) | |
| download | upstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.tar.gz upstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.tar.bz2 upstream-2464a9a8a4a3c7b4a0cb63db42b9906a0297979a.zip | |
kernel: bump 5.4 to 5.4.108
Refreshed all patches.
Compile-tested on: x86_64, ath79, lantiq
Runtime-tested on: x86_64, ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/802-can-0027-can-flexcan-add-CAN-wakeup-function-for-i.MX8.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 185ea9f21b..c3c43394ff 100644 --- 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(®s->mcr); -@@ -1770,11 +1814,6 @@ static int flexcan_setup_stop_mode(struc +@@ -1776,11 +1820,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: -@@ -1782,6 +1821,30 @@ out_put_node: +@@ -1788,6 +1827,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, }, -@@ -1924,9 +1987,19 @@ static int flexcan_probe(struct platform +@@ -1930,9 +1993,19 @@ static int flexcan_probe(struct platform devm_can_led_init(dev); if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE) { |