346-v5.18-03-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 9a4556dad7bd0a6b8339cb72e169f5c76f2af6f1 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
  3. Date: Thu, 3 Feb 2022 22:44:44 +0100
  4. Subject: [PATCH 3/3] Revert "PCI: aardvark: Fix initialization with old
  5. Marvell's Arm Trusted Firmware"
  6. MIME-Version: 1.0
  7. Content-Type: text/plain; charset=UTF-8
  8. Content-Transfer-Encoding: 8bit
  9. This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.
  10. Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return
  11. -EOPNOTSUPP from phy_power_on() callback anymore.
  12. So remove dead code which handles -EOPNOTSUPP return value.
  13. Signed-off-by: Pali Rohár <[email protected]>
  14. Signed-off-by: Marek Behún <[email protected]>
  15. Acked-by: Miquel Raynal <[email protected]>
  16. Acked-by: Lorenzo Pieralisi <[email protected]>
  17. Link: https://lore.kernel.org/r/[email protected]
  18. Signed-off-by: Vinod Koul <[email protected]>
  19. ---
  20. drivers/pci/controller/pci-aardvark.c | 4 +---
  21. 1 file changed, 1 insertion(+), 3 deletions(-)
  22. --- a/drivers/pci/controller/pci-aardvark.c
  23. +++ b/drivers/pci/controller/pci-aardvark.c
  24. @@ -1642,9 +1642,7 @@ static int advk_pcie_enable_phy(struct a
  25. }
  26. ret = phy_power_on(pcie->phy);
  27. - if (ret == -EOPNOTSUPP) {
  28. - dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
  29. - } else if (ret) {
  30. + if (ret) {
  31. phy_exit(pcie->phy);
  32. return ret;
  33. }