git.openwrt.org Git - openwrt/staging/aparcar.git/blob

   1 From 9a352062b7e3857742389dff6f64393481dc755e Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
   3 Date: Thu, 23 Sep 2021 19:37:05 +0200
   4 Subject: [PATCH] Revert "PCI: aardvark: Fix initialization with old Marvell's
   5  Arm Trusted Firmware"
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This reverts commit b0c6ae0f8948a2be6bf4e8b4bbab9ca1343289b6.
  11
  12 Armada 3720 phy driver (phy-mvebu-a3700-comphy.c) does not return
  13 -EOPNOTSUPP from phy_power_on() callback anymore.
  14
  15 So remove dead code which handles -EOPNOTSUPP return value.
  16
  17 Signed-off-by: Pali Rohár <pali@kernel.org>
  18 Signed-off-by: Marek Behún <kabel@kernel.org>
  19 Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
  20 ---
  21  drivers/pci/controller/pci-aardvark.c | 4 +---
  22  1 file changed, 1 insertion(+), 3 deletions(-)
  23
  24 diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
  25 index 319dd830e36e..4e64142b9ec4 100644
  26 --- a/drivers/pci/controller/pci-aardvark.c
  27 +++ b/drivers/pci/controller/pci-aardvark.c
  28 @@ -1635,9 +1635,7 @@ static int advk_pcie_enable_phy(struct advk_pcie *pcie)
  29         }
  30
  31         ret = phy_power_on(pcie->phy);
  32 -       if (ret == -EOPNOTSUPP) {
  33 -               dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
  34 -       } else if (ret) {
  35 +       if (ret) {
  36                 phy_exit(pcie->phy);
  37                 return ret;
  38         }
  39 --
  40 2.34.1
  41