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

   1 From 9a4556dad7bd0a6b8339cb72e169f5c76f2af6f1 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
   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
  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 Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  21 Link: https://lore.kernel.org/r/20220203214444.1508-6-kabel@kernel.org
  22 Signed-off-by: Vinod Koul <vkoul@kernel.org>
  23 ---
  24  drivers/pci/controller/pci-aardvark.c | 4 +---
  25  1 file changed, 1 insertion(+), 3 deletions(-)
  26
  27 --- a/drivers/pci/controller/pci-aardvark.c
  28 +++ b/drivers/pci/controller/pci-aardvark.c
  29 @@ -1642,9 +1642,7 @@ static int advk_pcie_enable_phy(struct a
  30         }
  31
  32         ret = phy_power_on(pcie->phy);
  33 -       if (ret == -EOPNOTSUPP) {
  34 -               dev_warn(&pcie->pdev->dev, "PHY unsupported by firmware\n");
  35 -       } else if (ret) {
  36 +       if (ret) {
  37                 phy_exit(pcie->phy);
  38                 return ret;
  39         }