aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-03-24 21:47:36 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-03-27 16:26:56 +0100
commit2464a9a8a4a3c7b4a0cb63db42b9906a0297979a (patch)
tree3259691b8c14d1e3ffe56676868711985590f68b /target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
parente8cbdbbe97d55b77062a3d80f42c87cb761e9729 (diff)
downloadupstream-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-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch b/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
index e1089fd41d..cb0526c62c 100644
--- a/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch
@@ -17,7 +17,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -1573,7 +1573,6 @@ static int flexcan_probe(struct platform
+@@ -1579,7 +1579,6 @@ static int flexcan_probe(struct platform
struct net_device *dev;
struct flexcan_priv *priv;
struct regulator *reg_xceiver;
@@ -25,7 +25,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
struct clk *clk_ipg = NULL, *clk_per = NULL;
struct flexcan_regs __iomem *regs;
int err, irq;
-@@ -1608,12 +1607,11 @@ static int flexcan_probe(struct platform
+@@ -1614,12 +1613,11 @@ static int flexcan_probe(struct platform
clock_freq = clk_get_rate(clk_per);
}