[PATCH] mvebu: espressobin: drop COMPHY removement patch

[Tomasz Maciej Nowak]

There are proper workarounds merged to 5.4 stable tree for ESPRESSObin
boards with older bootloader:
4e1a23779bde ("ata: ahci: mvebu: Make SATA PHY optional for Armada 3720")
40af962eb1d4 ("usb: host: xhci: mvebu: make USB 3.0 PHY optional for
Armada 3720")

Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
---
 ...l-espressobin-remove-COMPHY-nodes-as.patch | 53 -------------------
 ...itch-PHY-operation-mode-to-2500base.patch} |  0
 2 files changed, 53 deletions(-)
 delete mode 100644 target/linux/mvebu/patches-5.4/316-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch
 rename target/linux/mvebu/patches-5.4/{317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch => 316-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch} (100%)

diff --git a/target/linux/mvebu/patches-5.4/316-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
deleted file mode 100644
index 44e9a9237b42..000000000000
--- a/target/linux/mvebu/patches-5.4/316-arm64-dts-marvell-espressobin-remove-COMPHY-nodes-as.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e928880bd8b26fd704231549456ae7da88cecda6 Mon Sep 17 00:00:00 2001
-From: Tomasz Maciej Nowak <tmn505 at gmail.com>
-Date: Mon, 20 Apr 2020 14:35:34 +0200
-Subject: [PATCH] arm64: dts: marvell: espressobin: remove COMPHY nodes
- assignmet
-
-This commit removes changes from upstream commits:
-8e18c8e58da6 arm64: dts: marvell: armada-3720-espressobin: declare SATA
-PHY property
-bd3d25b07342 arm64: dts: marvell: armada-37xx: link USB hosts with their
-PHYs
-For most boards which have factory bootloader this caused that devices
-connected to USB 3.0 and SATA port were not detected. For them to
-function users would need to upgrade the bootloader to version with ARM
-Trusted Firmware 2.1 or later. Unfortunately there is no official
-bootloader image with updated ATF component, therefore drop these
-properties from nodes. This change was also tested briefly with
-bootloader with updated ATF and the ports functioned properly.
-
-Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
----
- arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
-@@ -64,8 +64,6 @@
- /* J6 */
- &sata {
- 	status = "okay";
--	phys = <&comphy2 0>;
--	phy-names = "sata-phy";
- };
- 
- /* J1 */
-@@ -131,11 +129,17 @@
- /* J7 */
- &usb3 {
- 	status = "okay";
-+
-+	/delete-property/ phys;
-+	/delete-property/ phy-names;
- };
- 
- /* J8 */
- &usb2 {
- 	status = "okay";
-+
-+	/delete-property/ phys;
-+	/delete-property/ phy-names;
- };
- 
- &mdio {
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/316-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
similarity index 100%
rename from target/linux/mvebu/patches-5.4/317-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
rename to target/linux/mvebu/patches-5.4/316-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
-- 
2.30.1