mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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
|
|
@@ -1637,9 +1637,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;
|
|
}
|