kernel-5.4: bump to 5.4.102 and refresh patches

[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 802-can-0007-can-flexcan-use-devm_platform_ioremap_resource-to-si.patch

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 b576cec2f404544f2d77a380e78a2f4ac8ff1f9d..e1089fd41da9ce22503e9c89553a4c60c2e7ae34 100644 (file)
--- 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
-@@ -1570,7 +1570,6 @@ static int flexcan_probe(struct platform
+@@ -1573,7 +1573,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;
-@@ -1605,12 +1604,11 @@ static int flexcan_probe(struct platform
+@@ -1608,12 +1607,11 @@ static int flexcan_probe(struct platform
                clock_freq = clk_get_rate(clk_per);
        }