27c9d80f51
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 9a4556dad7bd0a6b8339cb72e169f5c76f2af6f1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Thu, 3 Feb 2022 22:44:44 +0100
|
|
Subject: [PATCH 3/3] Revert "PCI: aardvark: Fix initialization with old
|
|
Marvell's Arm Trusted Firmware"
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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.
|
|
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
Link: https://lore.kernel.org/r/20220203214444.1508-6-kabel@kernel.org
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -1642,9 +1642,7 @@ static int advk_pcie_enable_phy(struct a
|
|
}
|
|
|
|
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;
|
|
}
|