mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
7a0af40e37
Removed upstreamed:
backport-5.10/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
pending-5.10/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b754b0c721)
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 9a352062b7e3857742389dff6f64393481dc755e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Thu, 23 Sep 2021 19:37:05 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
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
|
|
@@ -1634,9 +1634,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;
|
|
}
|