drop queue-5.4/phy-cadence-sierra-fix-phy-power_on-sequence.patch

diff --git a/queue-5.4/phy-cadence-sierra-fix-phy-power_on-sequence.patch b/queue-5.4/phy-cadence-sierra-fix-phy-power_on-sequence.patch
deleted file mode 100644 (file)
index 3304192..0000000
--- a/queue-5.4/phy-cadence-sierra-fix-phy-power_on-sequence.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5b4f5757f83be34d1428a1ffbb68d4a1966e9aae Mon Sep 17 00:00:00 2001
-From: Kishon Vijay Abraham I <kishon@ti.com>
-Date: Fri, 19 Mar 2021 18:11:16 +0530
-Subject: phy: cadence: Sierra: Fix PHY power_on sequence
-
-From: Kishon Vijay Abraham I <kishon@ti.com>
-
-commit 5b4f5757f83be34d1428a1ffbb68d4a1966e9aae upstream.
-
-Commit 44d30d622821d ("phy: cadence: Add driver for Sierra PHY")
-de-asserts PHY_RESET even before the configurations are loaded in
-phy_init(). However PHY_RESET should be de-asserted only after
-all the configurations has been initialized, instead of de-asserting
-in probe. Fix it here.
-
-Fixes: 44d30d622821d ("phy: cadence: Add driver for Sierra PHY")
-Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-Cc: <stable@vger.kernel.org> # v5.4+
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Link: https://lore.kernel.org/r/20210319124128.13308-2-kishon@ti.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/phy/cadence/phy-cadence-sierra.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/phy/cadence/phy-cadence-sierra.c
-+++ b/drivers/phy/cadence/phy-cadence-sierra.c
-@@ -125,6 +125,12 @@ static int cdns_sierra_phy_on(struct phy
- {
-       struct cdns_sierra_inst *ins = phy_get_drvdata(gphy);
- 
-+      ret = reset_control_deassert(sp->phy_rst);
-+      if (ret) {
-+              dev_err(dev, "Failed to take the PHY out of reset\n");
-+              return ret;
-+      }
-+
-       /* Take the PHY lane group out of reset */
-       return reset_control_deassert(ins->lnk_rst);
- }
-@@ -271,7 +277,6 @@ static int cdns_sierra_phy_probe(struct
- 
-       pm_runtime_enable(dev);
-       phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
--      reset_control_deassert(sp->phy_rst);
-       return PTR_ERR_OR_ZERO(phy_provider);
- 
- put_child:

diff --git a/queue-5.4/series b/queue-5.4/series
index 615adca510b5d7d1722c80c3f64264346d2332c6..4ec6e4440e04a95276a247aa93f093cf4632727e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -23,7 +23,6 @@ mips-pci-rt2880-fix-slot-0-configuration.patch
 fddi-defxx-bail-out-gracefully-with-unassigned-pci-resource-for-csr.patch
 pci-allow-vpd-access-for-qlogic-isp2722.patch
 iio-accel-adis16201-fix-wrong-axis-assignment-that-prevents-loading.patch
-phy-cadence-sierra-fix-phy-power_on-sequence.patch
 misc-lis3lv02d-fix-false-positive-warn-on-various-hp-models.patch
 misc-vmw_vmci-explicitly-initialize-vmci_notify_bm_set_msg-struct.patch
 misc-vmw_vmci-explicitly-initialize-vmci_datagram-payload.patch