This is a note to let you know that I've just added the patch titled
phy: qcom-qmp-combo: fix sc8180x reset
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
phy-qcom-qmp-combo-fix-sc8180x-reset.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 910dd4883d757af5faac92590f33f0f7da963032 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon, 14 Nov 2022 09:13:43 +0100
Subject: phy: qcom-qmp-combo: fix sc8180x reset
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 910dd4883d757af5faac92590f33f0f7da963032 upstream.
The SC8180X has two resets but the DP configuration erroneously
described only one.
In case the DP part of the PHY is initialised before the USB part (e.g.
depending on probe order), then only the first reset would be asserted.
Fixes: 1633802cd4ac ("phy: qcom: qmp: Add SC8180x USB/DP combo")
Cc: stable@xxxxxxxxxxxxxxx # 5.15
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20221114081346.5116-4-johan+linaro@xxxxxxxxxx
Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -1221,8 +1221,8 @@ static const struct qmp_phy_cfg sc8180x_
.clk_list = qmp_v3_phy_clk_l,
.num_clks = ARRAY_SIZE(qmp_v3_phy_clk_l),
- .reset_list = sc7180_usb3phy_reset_l,
- .num_resets = ARRAY_SIZE(sc7180_usb3phy_reset_l),
+ .reset_list = msm8996_usb3phy_reset_l,
+ .num_resets = ARRAY_SIZE(msm8996_usb3phy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.regs = qmp_v3_usb3phy_regs_layout,
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.1/phy-qcom-qmp-combo-fix-sdm845-reset.patch
queue-6.1/phy-qcom-qmp-combo-fix-out-of-bounds-clock-access.patch
queue-6.1/phy-qcom-qmp-combo-fix-sc8180x-reset.patch
queue-6.1/arm64-dts-qcom-sc8280xp-fix-ufs-reference-clocks.patch
queue-6.1/arm64-dts-qcom-sc8280xp-fix-ufs-dma-coherency.patch
