aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-06-02 10:51:02 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-02 17:46:51 +0200
commit392c64d8fdb5ae38813c009c439bad6f43e1a10b (patch)
tree88c1d601109d10c32d04edb494f5b1f3671f527f /target/linux/mvebu
parente238c85e571f5260a55a4c85fe92c68699e23521 (diff)
downloadupstream-392c64d8fdb5ae38813c009c439bad6f43e1a10b.tar.gz
upstream-392c64d8fdb5ae38813c009c439bad6f43e1a10b.tar.bz2
upstream-392c64d8fdb5ae38813c009c439bad6f43e1a10b.zip
kernel: bump 5.4 to 5.4.43
Refreshed patches, removed upstreamed patch: bcm27xx: 950-0642-component-Silence-bind-error-on-EPROBE_DEFER.patch Run tested: qemu-x86-64 Build tested: x86/64, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch4
-rw-r--r--target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch5
2 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
index 1056d801be..ff4be6006c 100644
--- a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -4644,6 +4644,14 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4652,6 +4652,14 @@ static int mvneta_ethtool_set_eee(struct
return phylink_ethtool_set_eee(pp->phylink, eee);
}
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open,
.ndo_stop = mvneta_stop,
-@@ -4654,6 +4662,7 @@ static const struct net_device_ops mvnet
+@@ -4662,6 +4670,7 @@ static const struct net_device_ops mvnet
.ndo_fix_features = mvneta_fix_features,
.ndo_get_stats64 = mvneta_get_stats64,
.ndo_do_ioctl = mvneta_ioctl,
diff --git a/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
index b1c508abab..53916a59e6 100644
--- a/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
+++ b/target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
@@ -12,8 +12,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
.../boot/dts/marvell/armada-3720-uDPU.dts | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
-diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-index 7eb6c1796cef..95d46e8d081c 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
@@ -117,18 +117,36 @@
@@ -55,6 +53,3 @@ index 7eb6c1796cef..95d46e8d081c 100644
lm75@48 {
status = "okay";
---
-2.20.1
-