Skip to contentSkip to conversation

Revert "PCI: aardvark: Fix initialization with old Marvell's Arm Trusted Firmware"

PATCH In review Marek Behún 2 participants 2 messages Feb 24, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v4 5/5 Revert "PCI: aardvark: Fix initialization with old Marvell's Arm Trusted Firmware"

From: Pali Rohár <[email protected]>

This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.

Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return -EOPNOTSUPP from phy_power_on() callback anymore.

So remove dead code which handles -EOPNOTSUPP return value.

---
Dear Lorenzo,

could you please give your Ack for this, so that Vinod can apply it with the rest of the comphy series?
The series can be found at
https://lore.kernel.org/linux-phy/[email protected]/

Marek

---
 drivers/pci/controller/pci-aardvark.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pci/controller/pci-aardvark.c +1 -3
index 4f5b44827d21..6bae688852a5 100644
@@ -1482,9 +1482,7 @@ static int advk_pcie_enable_phy(struct advk_pcie *pcie)
 	}
 
 	ret = phy_power_on(pcie->phy);
-	if (ret == -EOPNOTSUPP) {
-		dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
-	} else if (ret) {
+	if (ret) {
 		phy_exit(pcie->phy);
 		return ret;
 	}
Signature · 1 line
2.34.1
Acked-by on v4 5/5
#1 lore raw
Quoted 20 lines · Marek Behún

From: Pali Rohár <[email protected]>

This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.

Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return -EOPNOTSUPP from phy_power_on() callback anymore.

So remove dead code which handles -EOPNOTSUPP return value.

---
Dear Lorenzo,

could you please give your Ack for this, so that Vinod can apply it with the rest of the comphy series?
The series can be found at
https://lore.kernel.org/linux-phy/[email protected]/

Quoted 4 lines

Marek

---
 drivers/pci/controller/pci-aardvark.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Quoted 18 lines
drivers/pci/controller/pci-aardvark.c +1 -3
index 4f5b44827d21..6bae688852a5 100644
@@ -1482,9 +1482,7 @@ static int advk_pcie_enable_phy(struct advk_pcie *pcie)
 	}
 
 	ret = phy_power_on(pcie->phy);
-	if (ret == -EOPNOTSUPP) {
-		dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
-	} else if (ret) {
+	if (ret) {
 		phy_exit(pcie->phy);
 		return ret;
 	}
Signature · 1 line
2.34.1