diff mbox series

mvebu: sort patches

Message ID 20201123135945.5383-1-tmn505@gmail.com
State Accepted
Headers show
Series mvebu: sort patches | expand

Commit Message

Tomasz Maciej Nowak Nov. 23, 2020, 1:59 p.m. UTC
Sort patches according to target/linux/generic/PATCHES. Additionally:
- replace hashes in backported patches with the ones from main Linux tree
- add descriptions to some patches
- remove 004-add_sata_disk_activity_trigger.patch, as the trigger is
  already added in shared dtsi

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---

The dts changes are treated as arch patches, wonder if it'll be better
to move them to 9xx index as uncategorized other patches.

 ...-for-endpoint-to-be-ready-before-tr.patch} |  0
 ...t-rely-on-jiffies-while-holding-spi.patch} |  0
 ...troduce-mvneta_update_stats-routine.patch} |  2 +-
 .../004-add_sata_disk_activity_trigger.patch  | 39 -------------------
 ...uce-page-pool-API-for-sw-buffer-man.patch} |  2 +-
 ...n-build_skb-in-mvneta_rx_swbm-poll-.patch} |  2 +-
 ...06-net-mvneta-add-basic-XDP-support.patch} |  2 +-
 ...eader-prefetch-in-mvneta_swbm_rx_fr.patch} |  2 +-
 ...vneta-make-tx-buffer-array-agnostic.patch} |  2 +-
 ...> 009-net-mvneta-add-XDP_TX-support.patch} |  2 +-
 ...ix-build-skb-for-bm-capable-devices.patch} |  0
 ...arm64-dts-uDPU-remove-i2c-fast-mode.patch} |  7 ++--
 ...s-uDPU-SFP-cages-support-3W-modules.patch} |  7 ++--
 ...n-page_pool_recycle_direct-in-mvnet.patch} |  0
 ...allow-XDP-program-on-hardware-buffe.patch} |  0
 ...P-support-if-sw-bm-is-used-as-fallb.patch} |  0
 ...n-link-immediately-after-enabling-t.patch} |  0
 ...-PCI-aardvark-Improve-link-training.patch} |  0
 ...8-PCI-aardvark-Issue-PERST-via-GPIO.patch} |  0
 ...=> 019-PCI-aardvark-Add-PHY-support.patch} |  0
 ...-armada-37xx-Set-pcie_reset_pin-to-.patch} |  2 +-
 ...-armada-37xx-Move-PCIe-comphy-handl.patch} |  2 +-
 ...-armada-37xx-Move-PCIe-max-link-spe.patch} |  2 +-
 ...arm64-dts-add-uDPU-i2c-bus-recovery.patch} | 10 ++---
 ...t-touch-PCIe-registers-if-no-card-c.patch} |  0
 ...dd-driver-for-LinkStation-power-off.patch} | 32 ++++++++++++++-
 ...initialization-with-old-Marvell-s-A.patch} |  0
 ...-espressobin-Add-ethernet-switch-al.patch} |  0
 ...angle-bootloader-s-kernel-arguments.patch} |  0
 ...mvebu-armada-38x-enable-libata-leds.patch} |  0
 ...tables.patch => 302-add_powertables.patch} |  0
 ...-linksys_hardcode_nand_ecc_settings.patch} |  0
 ...delay.patch => 304-revert_i2c_delay.patch} |  0
 ...=> 305-armada-385-rd-mtd-partitions.patch} |  0
 ...306-ARM-mvebu-385-ap-Add-partitions.patch} |  0
 ...armada-xp-linksys-mamba-broken-idle.patch} |  0
 ... => 308-armada-xp-linksys-mamba-wan.patch} |  0
 ...led.patch => 309-linksys-status-led.patch} |  0
 ...=> 310-linksys-use-eth0-as-cpu-port.patch} |  0
 ...> 311-adjust-compatible-for-linksys.patch} |  0
 ...a388-clearfog-emmc-on-clearfog-base.patch} |  0
 ...=> 312-helios4-dts-status-led-alias.patch} |  0
 ...s-marvell-armada37xx-Add-eth0-alias.patch} |  0
 ...-armada-3720-espressobin-add-ports-.patch} |  0
 ...-espressobin-remove-COMPHY-nodes-as.patch} |  0
 ...witch-PHY-operation-mode-to-2500base.patch | 34 ++++++++++++++++
 ..._root.patch => 400-find_active_root.patch} |  0
 ...witch-PHY-operation-mode-to-2500base.patch | 20 ----------
 ...h => 700-mvneta-tx-queue-workaround.patch} |  0
 ...icate-failure-to-enter-deeper-sleep.patch} |  0
 ...pci-mvebu-time-out-reset-on-link-up.patch} |  0
 51 files changed, 87 insertions(+), 82 deletions(-)
 rename target/linux/mvebu/patches-5.4/{402-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch => 001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{403-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch => 002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{010-net-mvneta-introduce-mvneta_update_stats-routine.patch => 003-net-mvneta-introduce-mvneta_update_stats-routine.patch} (97%)
 delete mode 100644 target/linux/mvebu/patches-5.4/004-add_sata_disk_activity_trigger.patch
 rename target/linux/mvebu/patches-5.4/{011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch => 004-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch} (98%)
 rename target/linux/mvebu/patches-5.4/{012-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch => 005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch} (99%)
 rename target/linux/mvebu/patches-5.4/{013-net-mvneta-add-basic-XDP-support.patch => 006-net-mvneta-add-basic-XDP-support.patch} (99%)
 rename target/linux/mvebu/patches-5.4/{014-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch => 007-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch} (95%)
 rename target/linux/mvebu/patches-5.4/{015-net-mvneta-make-tx-buffer-array-agnostic.patch => 008-net-mvneta-make-tx-buffer-array-agnostic.patch} (98%)
 rename target/linux/mvebu/patches-5.4/{016-net-mvneta-add-XDP_TX-support.patch => 009-net-mvneta-add-XDP_TX-support.patch} (98%)
 rename target/linux/mvebu/patches-5.4/{020-net-mvneta-fix-build-skb-for-bm-capable-devices.patch => 010-net-mvneta-fix-build-skb-for-bm-capable-devices.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{545-arm64-dts-uDPU-remove-i2c-fast-mode.patch => 011-arm64-dts-uDPU-remove-i2c-fast-mode.patch} (76%)
 rename target/linux/mvebu/patches-5.4/{546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch => 012-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch} (81%)
 rename target/linux/mvebu/patches-5.4/{021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch => 013-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{022-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch => 014-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{023-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch => 015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{404-PCI-aardvark-Train-link-immediately-after-enabling-t.patch => 016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{405-PCI-aardvark-Improve-link-training.patch => 017-PCI-aardvark-Improve-link-training.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{406-PCI-aardvark-Issue-PERST-via-GPIO.patch => 018-PCI-aardvark-Issue-PERST-via-GPIO.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{407-PCI-aardvark-Add-PHY-support.patch => 019-PCI-aardvark-Add-PHY-support.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{552-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch => 020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch} (99%)
 rename target/linux/mvebu/patches-5.4/{553-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch => 021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch} (99%)
 rename target/linux/mvebu/patches-5.4/{554-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch => 022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch} (98%)
 rename target/linux/mvebu/patches-5.4/{551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch => 023-arm64-dts-add-uDPU-i2c-bus-recovery.patch} (72%)
 rename target/linux/mvebu/patches-5.4/{408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch => 024-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{030-linkstation-poweroff.patch => 025-power-reset-add-driver-for-LinkStation-power-off.patch} (79%)
 rename target/linux/mvebu/patches-5.4/{410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch => 026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch => 027-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{006-mvebu-Mangle-bootloader-s-kernel-arguments.patch => 300-mvebu-Mangle-bootloader-s-kernel-arguments.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{561-mvebu-armada-38x-enable-libata-leds.patch => 301-mvebu-armada-38x-enable-libata-leds.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{002-add_powertables.patch => 302-add_powertables.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{005-linksys_hardcode_nand_ecc_settings.patch => 303-linksys_hardcode_nand_ecc_settings.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{102-revert_i2c_delay.patch => 304-revert_i2c_delay.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{205-armada-385-rd-mtd-partitions.patch => 305-armada-385-rd-mtd-partitions.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{206-ARM-mvebu-385-ap-Add-partitions.patch => 306-ARM-mvebu-385-ap-Add-partitions.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{230-armada-xp-linksys-mamba-broken-idle.patch => 307-armada-xp-linksys-mamba-broken-idle.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{231-armada-xp-linksys-mamba-wan.patch => 308-armada-xp-linksys-mamba-wan.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{240-linksys-status-led.patch => 309-linksys-status-led.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{241-linksys-use-eth0-as-cpu-port.patch => 310-linksys-use-eth0-as-cpu-port.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{250-adjust-compatible-for-linksys.patch => 311-adjust-compatible-for-linksys.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{412-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch => 312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{560-helios4-dts-status-led-alias.patch => 312-helios4-dts-status-led-alias.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{520-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch => 314-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{522-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch => 315-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{523-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch => 316-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch} (100%)
 create mode 100644 target/linux/mvebu/patches-5.4/317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
 rename target/linux/mvebu/patches-5.4/{100-find_active_root.patch => 400-find_active_root.patch} (100%)
 delete mode 100644 target/linux/mvebu/patches-5.4/550-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
 rename target/linux/mvebu/patches-5.4/{300-mvneta-tx-queue-workaround.patch => 700-mvneta-tx-queue-workaround.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{400-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch => 800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch} (100%)
 rename target/linux/mvebu/patches-5.4/{401-pci-mvebu-time-out-reset-on-link-up.patch => 801-pci-mvebu-time-out-reset-on-link-up.patch} (100%)
diff mbox series

Patch

diff --git a/target/linux/mvebu/patches-5.4/402-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch b/target/linux/mvebu/patches-5.4/001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/402-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch
rename to target/linux/mvebu/patches-5.4/001-PCI-aardvark-Wait-for-endpoint-to-be-ready-before-tr.patch
diff --git a/target/linux/mvebu/patches-5.4/403-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch b/target/linux/mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/403-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
rename to target/linux/mvebu/patches-5.4/002-PCI-aardvark-Don-t-rely-on-jiffies-while-holding-spi.patch
diff --git a/target/linux/mvebu/patches-5.4/010-net-mvneta-introduce-mvneta_update_stats-routine.patch b/target/linux/mvebu/patches-5.4/003-net-mvneta-introduce-mvneta_update_stats-routine.patch
similarity index 97%
rename from target/linux/mvebu/patches-5.4/010-net-mvneta-introduce-mvneta_update_stats-routine.patch
rename to target/linux/mvebu/patches-5.4/003-net-mvneta-introduce-mvneta_update_stats-routine.patch
index 2c8ed30e4a48..f6ce6163cff2 100644
--- a/target/linux/mvebu/patches-5.4/010-net-mvneta-introduce-mvneta_update_stats-routine.patch
+++ b/target/linux/mvebu/patches-5.4/003-net-mvneta-introduce-mvneta_update_stats-routine.patch
@@ -1,4 +1,4 @@ 
-From 06815202344ee6c256b63e68c16cdc3b0480f4ee Mon Sep 17 00:00:00 2001
+From ff519e2acd463bff6c5bb4e8d7ed350c9bae885b Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:21 +0200
 Subject: [PATCH 1/7] net: mvneta: introduce mvneta_update_stats routine
diff --git a/target/linux/mvebu/patches-5.4/004-add_sata_disk_activity_trigger.patch b/target/linux/mvebu/patches-5.4/004-add_sata_disk_activity_trigger.patch
deleted file mode 100644
index 2cb8f2549065..000000000000
--- a/target/linux/mvebu/patches-5.4/004-add_sata_disk_activity_trigger.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 172230195068703b78ad5733a09492f5d6814c09 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Tue, 28 Feb 2017 14:15:50 +0100
-Subject: [PATCH] ARM: dts: armada: Add default trigger for sata led
-
-In others board we have the sata led set to function
-with the sata led trigger by default.
-This patch makes the same for these board that have sata
-led but get disabled by not associating it to any trigger.
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
-Acked-by: Jason Cooper <jason@lakedaemon.net>
-Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
----
- arch/arm/boot/dts/armada-385-linksys-caiman.dts | 1 +
- arch/arm/boot/dts/armada-385-linksys-cobra.dts  | 1 +
- arch/arm/boot/dts/armada-xp-linksys-mamba.dts   | 1 +
- 3 files changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
-+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
-@@ -68,6 +68,7 @@
- 
- 	sata {
- 		label = "caiman:white:sata";
-+		linux,default-trigger = "disk-activity";
- 	};
- };
- 
---- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
-+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
-@@ -68,6 +68,7 @@
- 
- 	sata {
- 		label = "cobra:white:sata";
-+		linux,default-trigger = "disk-activity";
- 	};
- };
- 
diff --git a/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch b/target/linux/mvebu/patches-5.4/004-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
similarity index 98%
rename from target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
rename to target/linux/mvebu/patches-5.4/004-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
index dbed6df87355..fbcae20f7424 100644
--- a/target/linux/mvebu/patches-5.4/011-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
+++ b/target/linux/mvebu/patches-5.4/004-net-mvneta-introduce-page-pool-API-for-sw-buffer-man.patch
@@ -1,4 +1,4 @@ 
-From 160f006a6fe904177cbca867c48dfb6d27262dd5 Mon Sep 17 00:00:00 2001
+From 568a3fa24a95476d40afe3f8616bafb543bc4182 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:22 +0200
 Subject: [PATCH 2/7] net: mvneta: introduce page pool API for sw buffer
diff --git a/target/linux/mvebu/patches-5.4/012-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
similarity index 99%
rename from target/linux/mvebu/patches-5.4/012-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
rename to target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
index e3269a592f17..9038ca8ca8da 100644
--- a/target/linux/mvebu/patches-5.4/012-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
+++ b/target/linux/mvebu/patches-5.4/005-net-mvneta-rely-on-build_skb-in-mvneta_rx_swbm-poll-.patch
@@ -1,4 +1,4 @@ 
-From 00cf2a1d7d58631ba137b9acabe1de1d542625a8 Mon Sep 17 00:00:00 2001
+From 8dc9a0888f4c8e27b25e48ff1b4bc2b3a845cc2d Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:23 +0200
 Subject: [PATCH 3/7] net: mvneta: rely on build_skb in mvneta_rx_swbm poll
diff --git a/target/linux/mvebu/patches-5.4/013-net-mvneta-add-basic-XDP-support.patch b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
similarity index 99%
rename from target/linux/mvebu/patches-5.4/013-net-mvneta-add-basic-XDP-support.patch
rename to target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
index 62c00ddeb193..163632df513a 100644
--- a/target/linux/mvebu/patches-5.4/013-net-mvneta-add-basic-XDP-support.patch
+++ b/target/linux/mvebu/patches-5.4/006-net-mvneta-add-basic-XDP-support.patch
@@ -1,4 +1,4 @@ 
-From f21366d964bd41a2b823beed36a7c3e7a728857b Mon Sep 17 00:00:00 2001
+From 0db51da7a8e99f0803ec3a8e25c1a66234a219cb Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:24 +0200
 Subject: [PATCH 4/7] net: mvneta: add basic XDP support
diff --git a/target/linux/mvebu/patches-5.4/014-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch b/target/linux/mvebu/patches-5.4/007-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch
similarity index 95%
rename from target/linux/mvebu/patches-5.4/014-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch
rename to target/linux/mvebu/patches-5.4/007-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch
index ecda482875af..e075796e41b8 100644
--- a/target/linux/mvebu/patches-5.4/014-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch
+++ b/target/linux/mvebu/patches-5.4/007-net-mvneta-move-header-prefetch-in-mvneta_swbm_rx_fr.patch
@@ -1,4 +1,4 @@ 
-From 8abaeebfa7ef9a5600f4f596d2e94aa253f47553 Mon Sep 17 00:00:00 2001
+From fa383f6b77a2ed788266fa8fbfb659aa284d2f58 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:25 +0200
 Subject: [PATCH 5/7] net: mvneta: move header prefetch in mvneta_swbm_rx_frame
diff --git a/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch b/target/linux/mvebu/patches-5.4/008-net-mvneta-make-tx-buffer-array-agnostic.patch
similarity index 98%
rename from target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch
rename to target/linux/mvebu/patches-5.4/008-net-mvneta-make-tx-buffer-array-agnostic.patch
index 1146c1f2b869..e79aa816b886 100644
--- a/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch
+++ b/target/linux/mvebu/patches-5.4/008-net-mvneta-make-tx-buffer-array-agnostic.patch
@@ -1,4 +1,4 @@ 
-From f7f705a63cd4bd1e3463db7662011717c5149e8a Mon Sep 17 00:00:00 2001
+From 9e58c8b410650b5a6eb5b8fad8474bd8425a4023 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:26 +0200
 Subject: [PATCH 6/7] net: mvneta: make tx buffer array agnostic
diff --git a/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch b/target/linux/mvebu/patches-5.4/009-net-mvneta-add-XDP_TX-support.patch
similarity index 98%
rename from target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch
rename to target/linux/mvebu/patches-5.4/009-net-mvneta-add-XDP_TX-support.patch
index 012bdee8bf30..c971030a1edb 100644
--- a/target/linux/mvebu/patches-5.4/016-net-mvneta-add-XDP_TX-support.patch
+++ b/target/linux/mvebu/patches-5.4/009-net-mvneta-add-XDP_TX-support.patch
@@ -1,4 +1,4 @@ 
-From 2ca7bbf394e6d98741f19566b82b3d5a56e9cc2c Mon Sep 17 00:00:00 2001
+From b0a43db9087a21d96e1a0b716b8d9963064b2d58 Mon Sep 17 00:00:00 2001
 From: Lorenzo Bianconi <lorenzo@kernel.org>
 Date: Sat, 19 Oct 2019 10:13:27 +0200
 Subject: [PATCH 7/7] net: mvneta: add XDP_TX support
diff --git a/target/linux/mvebu/patches-5.4/020-net-mvneta-fix-build-skb-for-bm-capable-devices.patch b/target/linux/mvebu/patches-5.4/010-net-mvneta-fix-build-skb-for-bm-capable-devices.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/020-net-mvneta-fix-build-skb-for-bm-capable-devices.patch
rename to target/linux/mvebu/patches-5.4/010-net-mvneta-fix-build-skb-for-bm-capable-devices.patch
diff --git a/target/linux/mvebu/patches-5.4/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch b/target/linux/mvebu/patches-5.4/011-arm64-dts-uDPU-remove-i2c-fast-mode.patch
similarity index 76%
rename from target/linux/mvebu/patches-5.4/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch
rename to target/linux/mvebu/patches-5.4/011-arm64-dts-uDPU-remove-i2c-fast-mode.patch
index b984eb4ba16d..2922d49f4494 100644
--- a/target/linux/mvebu/patches-5.4/545-arm64-dts-uDPU-remove-i2c-fast-mode.patch
+++ b/target/linux/mvebu/patches-5.4/011-arm64-dts-uDPU-remove-i2c-fast-mode.patch
@@ -1,12 +1,13 @@ 
-From 662eb8fc87f982e63ccb9a9df25c7aeabf9fe341 Mon Sep 17 00:00:00 2001
+From fe3ec631a77ded87817f449691710a436a80caa7 Mon Sep 17 00:00:00 2001
 From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Thu, 14 Nov 2019 00:23:35 +0000
-Subject: [PATCH 658/660] arm64: dts: uDPU: remove i2c-fast-mode
+Date: Sat, 16 Nov 2019 11:07:01 +0000
+Subject: [PATCH] arm64: dts: uDPU: remove i2c-fast-mode
 
 The I2C bus violates the timing specifications when run in fast mode
 on the uDPU, so switch to 100kHz mode.
 
 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
 ---
  arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++
  1 file changed, 2 insertions(+)
diff --git a/target/linux/mvebu/patches-5.4/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch b/target/linux/mvebu/patches-5.4/012-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch
similarity index 81%
rename from target/linux/mvebu/patches-5.4/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch
rename to target/linux/mvebu/patches-5.4/012-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch
index d025f36a53c1..1884def2c699 100644
--- a/target/linux/mvebu/patches-5.4/546-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch
+++ b/target/linux/mvebu/patches-5.4/012-arm64-dts-uDPU-SFP-cages-support-3W-modules.patch
@@ -1,7 +1,7 @@ 
-From 1cb114a20854e34324a2cb308f23054ff8227ffa Mon Sep 17 00:00:00 2001
+From cd592187f9de3c6305d6c1c66f7fac084cb5b846 Mon Sep 17 00:00:00 2001
 From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Tue, 19 Nov 2019 22:48:50 +0000
-Subject: [PATCH 659/660] arm64: dts: uDPU: SFP cages support 3W modules
+Date: Tue, 19 Nov 2019 22:53:04 +0000
+Subject: [PATCH] arm64: dts: uDPU: SFP cages support 3W modules
 
 The SFP cages are designed to support up to 3W modules, such as G.hn,
 G.fast and MoCA modules. Although there is no way for such modules to
@@ -9,6 +9,7 @@  declare to software that they consume 3W, we document in DT that this
 is the designed power level for these cages.
 
 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
 ---
  arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 2 ++
  1 file changed, 2 insertions(+)
diff --git a/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch b/target/linux/mvebu/patches-5.4/013-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
rename to target/linux/mvebu/patches-5.4/013-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
diff --git a/target/linux/mvebu/patches-5.4/022-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch b/target/linux/mvebu/patches-5.4/014-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/022-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch
rename to target/linux/mvebu/patches-5.4/014-mvneta-driver-disallow-XDP-program-on-hardware-buffe.patch
diff --git a/target/linux/mvebu/patches-5.4/023-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch b/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/023-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch
rename to target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch
diff --git a/target/linux/mvebu/patches-5.4/404-PCI-aardvark-Train-link-immediately-after-enabling-t.patch b/target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/404-PCI-aardvark-Train-link-immediately-after-enabling-t.patch
rename to target/linux/mvebu/patches-5.4/016-PCI-aardvark-Train-link-immediately-after-enabling-t.patch
diff --git a/target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch b/target/linux/mvebu/patches-5.4/017-PCI-aardvark-Improve-link-training.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/405-PCI-aardvark-Improve-link-training.patch
rename to target/linux/mvebu/patches-5.4/017-PCI-aardvark-Improve-link-training.patch
diff --git a/target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch b/target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/406-PCI-aardvark-Issue-PERST-via-GPIO.patch
rename to target/linux/mvebu/patches-5.4/018-PCI-aardvark-Issue-PERST-via-GPIO.patch
diff --git a/target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch b/target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/407-PCI-aardvark-Add-PHY-support.patch
rename to target/linux/mvebu/patches-5.4/019-PCI-aardvark-Add-PHY-support.patch
diff --git a/target/linux/mvebu/patches-5.4/552-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
similarity index 99%
rename from target/linux/mvebu/patches-5.4/552-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
rename to target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
index 9eeddaeba160..87247b63ad7b 100644
--- a/target/linux/mvebu/patches-5.4/552-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
+++ b/target/linux/mvebu/patches-5.4/020-arm64-dts-marvell-armada-37xx-Set-pcie_reset_pin-to-.patch
@@ -82,7 +82,7 @@  Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
  	pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
 +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-@@ -318,7 +318,7 @@
+@@ -317,7 +317,7 @@
  
  				pcie_reset_pins: pcie-reset-pins {
  					groups = "pcie1";
diff --git a/target/linux/mvebu/patches-5.4/553-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
similarity index 99%
rename from target/linux/mvebu/patches-5.4/553-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
rename to target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
index 0c7830cb4750..e92393ff6f74 100644
--- a/target/linux/mvebu/patches-5.4/553-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
+++ b/target/linux/mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch
@@ -47,7 +47,7 @@  Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
  	status = "disabled";
 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
 +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-@@ -494,6 +494,7 @@
+@@ -493,6 +493,7 @@
  					<0 0 0 2 &pcie_intc 1>,
  					<0 0 0 3 &pcie_intc 2>,
  					<0 0 0 4 &pcie_intc 3>;
diff --git a/target/linux/mvebu/patches-5.4/554-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch
similarity index 98%
rename from target/linux/mvebu/patches-5.4/554-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch
rename to target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch
index 04002480cc5a..ad918bef8876 100644
--- a/target/linux/mvebu/patches-5.4/554-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch
+++ b/target/linux/mvebu/patches-5.4/022-arm64-dts-marvell-armada-37xx-Move-PCIe-max-link-spe.patch
@@ -34,7 +34,7 @@  Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
  	/* enabled by U-Boot if PCIe module is present */
 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
 +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
-@@ -494,6 +494,7 @@
+@@ -493,6 +493,7 @@
  					<0 0 0 2 &pcie_intc 1>,
  					<0 0 0 3 &pcie_intc 2>,
  					<0 0 0 4 &pcie_intc 3>;
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/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
similarity index 72%
rename from target/linux/mvebu/patches-5.4/551-v5.8-arm64-dts-add-uDPU-i2c-bus-recovery.patch
rename to target/linux/mvebu/patches-5.4/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
index 53916a59e6b0..818fce85a8b6 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/023-arm64-dts-add-uDPU-i2c-bus-recovery.patch
@@ -1,13 +1,11 @@ 
+From 11b2af36cc874027ce701c5784cb957c99c7de3d Mon Sep 17 00:00:00 2001
 From: Russell King <rmk+kernel@armlinux.org.uk>
-Bcc: linux@mail.armlinux.org.uk
-Cc: Vladimir Vid <vladimir.vid@sartura.hr>,Jason Cooper <jason@lakedaemon.net>,Andrew Lunn <andrew@lunn.ch>,Gregory Clement <gregory.clement@bootlin.com>,Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,Rob Herring <robh+dt@kernel.org>,Mark Rutland <mark.rutland@arm.com>,linux-arm-kernel@lists.infradead.org,devicetree@vger.kernel.org
+Date: Wed, 6 May 2020 10:40:37 +0100
 Subject: [PATCH] arm64: dts: add uDPU i2c bus recovery
-MIME-Version: 1.0
-Content-Disposition: inline
-Content-Transfer-Encoding: 8bit
-Content-Type: text/plain; charset="utf-8"
 
 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
 ---
  .../boot/dts/marvell/armada-3720-uDPU.dts     | 22 +++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch b/target/linux/mvebu/patches-5.4/024-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/408-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
rename to target/linux/mvebu/patches-5.4/024-PCI-aardvark-Don-t-touch-PCIe-registers-if-no-card-c.patch
diff --git a/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch b/target/linux/mvebu/patches-5.4/025-power-reset-add-driver-for-LinkStation-power-off.patch
similarity index 79%
rename from target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch
rename to target/linux/mvebu/patches-5.4/025-power-reset-add-driver-for-LinkStation-power-off.patch
index 7b7e8cd0344e..64ea26559e17 100644
--- a/target/linux/mvebu/patches-5.4/030-linkstation-poweroff.patch
+++ b/target/linux/mvebu/patches-5.4/025-power-reset-add-driver-for-LinkStation-power-off.patch
@@ -1,3 +1,33 @@ 
+From a7f79f99541eff4e6bcae0014eb08d3019337565 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Gonz=C3=A1lez=20Cabanelas?= <dgcbueu@gmail.com>
+Date: Wed, 15 Jul 2020 15:35:14 +0200
+Subject: [PATCH] power: reset: add driver for LinkStation power off
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some Buffalo LinkStations perform the power off operation, at restart
+time, depending on the state of an output pin (LED2/INTn) at the ethernet
+PHY. This pin is also used to wake the machine when a WoL packet is
+received by the PHY.
+
+The driver is required by the Buffalo LinkStation LS421DE (ARM MVEBU),
+and other models. Without it, the board remains forever halted if a
+power off command is executed, unless the PSU is disconnected and
+connected again.
+
+Add the driver to provide the power off function and also make the WoL
+feature to be available.
+
+Signed-off-by: Daniel González Cabanelas <dgcbueu@gmail.com>
+Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+---
+ drivers/power/reset/Kconfig                |  11 ++
+ drivers/power/reset/Makefile               |   1 +
+ drivers/power/reset/linkstation-poweroff.c | 136 +++++++++++++++++++++
+ 3 files changed, 148 insertions(+)
+ create mode 100644 drivers/power/reset/linkstation-poweroff.c
+
 --- a/drivers/power/reset/Kconfig
 +++ b/drivers/power/reset/Kconfig
 @@ -99,6 +99,17 @@ config POWER_RESET_HISI
@@ -86,7 +116,7 @@ 
 +		__phy_read(phydev, MII_M1011_IEVENT);
 +
 +		/* If WOL was enabled and a magic packet was received before powering
-+		 * off, we won't be able to wake up by sending another magic packet. 
++		 * off, we won't be able to wake up by sending another magic packet.
 +		 * Clear WOL status.
 +		 */
 +		__phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_MARVELL_WOL_PAGE);
diff --git a/target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch b/target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/410-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
rename to target/linux/mvebu/patches-5.4/026-PCI-aardvark-Fix-initialization-with-old-Marvell-s-A.patch
diff --git a/target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch b/target/linux/mvebu/patches-5.4/027-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/521-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
rename to target/linux/mvebu/patches-5.4/027-arm64-dts-marvell-espressobin-Add-ethernet-switch-al.patch
diff --git a/target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
rename to target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
diff --git a/target/linux/mvebu/patches-5.4/561-mvebu-armada-38x-enable-libata-leds.patch b/target/linux/mvebu/patches-5.4/301-mvebu-armada-38x-enable-libata-leds.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/561-mvebu-armada-38x-enable-libata-leds.patch
rename to target/linux/mvebu/patches-5.4/301-mvebu-armada-38x-enable-libata-leds.patch
diff --git a/target/linux/mvebu/patches-5.4/002-add_powertables.patch b/target/linux/mvebu/patches-5.4/302-add_powertables.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/002-add_powertables.patch
rename to target/linux/mvebu/patches-5.4/302-add_powertables.patch
diff --git a/target/linux/mvebu/patches-5.4/005-linksys_hardcode_nand_ecc_settings.patch b/target/linux/mvebu/patches-5.4/303-linksys_hardcode_nand_ecc_settings.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/005-linksys_hardcode_nand_ecc_settings.patch
rename to target/linux/mvebu/patches-5.4/303-linksys_hardcode_nand_ecc_settings.patch
diff --git a/target/linux/mvebu/patches-5.4/102-revert_i2c_delay.patch b/target/linux/mvebu/patches-5.4/304-revert_i2c_delay.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/102-revert_i2c_delay.patch
rename to target/linux/mvebu/patches-5.4/304-revert_i2c_delay.patch
diff --git a/target/linux/mvebu/patches-5.4/205-armada-385-rd-mtd-partitions.patch b/target/linux/mvebu/patches-5.4/305-armada-385-rd-mtd-partitions.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/205-armada-385-rd-mtd-partitions.patch
rename to target/linux/mvebu/patches-5.4/305-armada-385-rd-mtd-partitions.patch
diff --git a/target/linux/mvebu/patches-5.4/206-ARM-mvebu-385-ap-Add-partitions.patch b/target/linux/mvebu/patches-5.4/306-ARM-mvebu-385-ap-Add-partitions.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/206-ARM-mvebu-385-ap-Add-partitions.patch
rename to target/linux/mvebu/patches-5.4/306-ARM-mvebu-385-ap-Add-partitions.patch
diff --git a/target/linux/mvebu/patches-5.4/230-armada-xp-linksys-mamba-broken-idle.patch b/target/linux/mvebu/patches-5.4/307-armada-xp-linksys-mamba-broken-idle.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/230-armada-xp-linksys-mamba-broken-idle.patch
rename to target/linux/mvebu/patches-5.4/307-armada-xp-linksys-mamba-broken-idle.patch
diff --git a/target/linux/mvebu/patches-5.4/231-armada-xp-linksys-mamba-wan.patch b/target/linux/mvebu/patches-5.4/308-armada-xp-linksys-mamba-wan.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/231-armada-xp-linksys-mamba-wan.patch
rename to target/linux/mvebu/patches-5.4/308-armada-xp-linksys-mamba-wan.patch
diff --git a/target/linux/mvebu/patches-5.4/240-linksys-status-led.patch b/target/linux/mvebu/patches-5.4/309-linksys-status-led.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/240-linksys-status-led.patch
rename to target/linux/mvebu/patches-5.4/309-linksys-status-led.patch
diff --git a/target/linux/mvebu/patches-5.4/241-linksys-use-eth0-as-cpu-port.patch b/target/linux/mvebu/patches-5.4/310-linksys-use-eth0-as-cpu-port.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/241-linksys-use-eth0-as-cpu-port.patch
rename to target/linux/mvebu/patches-5.4/310-linksys-use-eth0-as-cpu-port.patch
diff --git a/target/linux/mvebu/patches-5.4/250-adjust-compatible-for-linksys.patch b/target/linux/mvebu/patches-5.4/311-adjust-compatible-for-linksys.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/250-adjust-compatible-for-linksys.patch
rename to target/linux/mvebu/patches-5.4/311-adjust-compatible-for-linksys.patch
diff --git a/target/linux/mvebu/patches-5.4/412-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch b/target/linux/mvebu/patches-5.4/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/412-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
rename to target/linux/mvebu/patches-5.4/312-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch
diff --git a/target/linux/mvebu/patches-5.4/560-helios4-dts-status-led-alias.patch b/target/linux/mvebu/patches-5.4/312-helios4-dts-status-led-alias.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/560-helios4-dts-status-led-alias.patch
rename to target/linux/mvebu/patches-5.4/312-helios4-dts-status-led-alias.patch
diff --git a/target/linux/mvebu/patches-5.4/520-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch b/target/linux/mvebu/patches-5.4/314-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/520-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
rename to target/linux/mvebu/patches-5.4/314-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch
diff --git a/target/linux/mvebu/patches-5.4/522-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch b/target/linux/mvebu/patches-5.4/315-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/522-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch
rename to target/linux/mvebu/patches-5.4/315-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch
diff --git a/target/linux/mvebu/patches-5.4/523-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch b/target/linux/mvebu/patches-5.4/316-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/523-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch
rename to target/linux/mvebu/patches-5.4/316-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch
diff --git a/target/linux/mvebu/patches-5.4/317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch b/target/linux/mvebu/patches-5.4/317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
new file mode 100644
index 000000000000..2240d0b39e63
--- /dev/null
+++ b/target/linux/mvebu/patches-5.4/317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
@@ -0,0 +1,34 @@ 
+Certain SFP modules (most notably Nokia GPON ones) first check
+connectivity on 1000base-x, and switch to 2500base-x afterwards. This
+is considered a quirk so the phylink switches the interface to
+2500base-x as well.
+
+However, after power-cycling the uDPU device, network interface/SFP module
+will not work correctly until the module is re-seated. This patch
+resolves this issue by forcing the interface to be brought up in
+2500base-x mode by default.
+
+Signed-off-by: Jakov Petrina <jakov.petrina@sartura.hr>
+Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
+Cc: Luka Perkov <luka.perkov@sartura.hr>
+
+--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
++++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+@@ -162,7 +162,7 @@
+ };
+ 
+ &eth0 {
+-	phy-mode = "sgmii";
++	phy-mode = "2500base-x";
+ 	status = "okay";
+ 	managed = "in-band-status";
+ 	phys = <&comphy1 0>;
+@@ -170,7 +170,7 @@
+ };
+ 
+ &eth1 {
+-	phy-mode = "sgmii";
++	phy-mode = "2500base-x";
+ 	status = "okay";
+ 	managed = "in-band-status";
+ 	phys = <&comphy0 1>;
diff --git a/target/linux/mvebu/patches-5.4/100-find_active_root.patch b/target/linux/mvebu/patches-5.4/400-find_active_root.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/100-find_active_root.patch
rename to target/linux/mvebu/patches-5.4/400-find_active_root.patch
diff --git a/target/linux/mvebu/patches-5.4/550-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch b/target/linux/mvebu/patches-5.4/550-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
deleted file mode 100644
index 82715312d83c..000000000000
--- a/target/linux/mvebu/patches-5.4/550-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
---- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
-@@ -144,7 +144,7 @@
- };
- 
- &eth0 {
--	phy-mode = "sgmii";
-+	phy-mode = "2500base-x";
- 	status = "okay";
- 	managed = "in-band-status";
- 	phys = <&comphy1 0>;
-@@ -152,7 +152,7 @@
- };
- 
- &eth1 {
--	phy-mode = "sgmii";
-+	phy-mode = "2500base-x";
- 	status = "okay";
- 	managed = "in-band-status";
- 	phys = <&comphy0 1>;
diff --git a/target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/300-mvneta-tx-queue-workaround.patch
rename to target/linux/mvebu/patches-5.4/700-mvneta-tx-queue-workaround.patch
diff --git a/target/linux/mvebu/patches-5.4/400-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch b/target/linux/mvebu/patches-5.4/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/400-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
rename to target/linux/mvebu/patches-5.4/800-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch
diff --git a/target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch b/target/linux/mvebu/patches-5.4/801-pci-mvebu-time-out-reset-on-link-up.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/401-pci-mvebu-time-out-reset-on-link-up.patch
rename to target/linux/mvebu/patches-5.4/801-pci-mvebu-time-out-reset-on-link-up.patch