mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6
commit025a6f7448
upstream. Commit5abed58a8b
("phy: qcom: qmp-combo: Fix VCO div offset on v3") fixed a regression introduced in 6.5 by making sure that the correct offset is used for the DP_PHY_VCO_DIV register on v3 hardware. Unfortunately, that fix instead broke DisplayPort on v5_5nm and v6 hardware as it failed to add the corresponding offsets also to those register tables. Fixes:815891eee6
("phy: qcom-qmp-combo: Introduce orientation variable") Fixes:5abed58a8b
("phy: qcom: qmp-combo: Fix VCO div offset on v3") Cc: stable@vger.kernel.org # 6.5:5abed58a8b
Cc: Stephen Boyd <swboyd@chromium.org> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Link: https://lore.kernel.org/r/20240408093023.506-1-johan+linaro@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org>
This commit is contained in:
parent
357c64ef1e
commit
77db058d69
2 changed files with 4 additions and 0 deletions
|
@ -188,6 +188,7 @@ static const unsigned int qmp_v5_5nm_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
|
|||
[QPHY_COM_BIAS_EN_CLKBUFLR_EN] = QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN,
|
||||
|
||||
[QPHY_DP_PHY_STATUS] = QSERDES_V5_DP_PHY_STATUS,
|
||||
[QPHY_DP_PHY_VCO_DIV] = QSERDES_V5_DP_PHY_VCO_DIV,
|
||||
|
||||
[QPHY_TX_TX_POL_INV] = QSERDES_V5_5NM_TX_TX_POL_INV,
|
||||
[QPHY_TX_TX_DRV_LVL] = QSERDES_V5_5NM_TX_TX_DRV_LVL,
|
||||
|
@ -212,6 +213,7 @@ static const unsigned int qmp_v6_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
|
|||
[QPHY_COM_BIAS_EN_CLKBUFLR_EN] = QSERDES_V6_COM_PLL_BIAS_EN_CLK_BUFLR_EN,
|
||||
|
||||
[QPHY_DP_PHY_STATUS] = QSERDES_V6_DP_PHY_STATUS,
|
||||
[QPHY_DP_PHY_VCO_DIV] = QSERDES_V6_DP_PHY_VCO_DIV,
|
||||
|
||||
[QPHY_TX_TX_POL_INV] = QSERDES_V6_TX_TX_POL_INV,
|
||||
[QPHY_TX_TX_DRV_LVL] = QSERDES_V6_TX_TX_DRV_LVL,
|
||||
|
|
|
@ -132,9 +132,11 @@
|
|||
#define QSERDES_V4_DP_PHY_AUX_INTERRUPT_STATUS 0x0d8
|
||||
#define QSERDES_V4_DP_PHY_STATUS 0x0dc
|
||||
|
||||
#define QSERDES_V5_DP_PHY_VCO_DIV 0x070
|
||||
#define QSERDES_V5_DP_PHY_STATUS 0x0dc
|
||||
|
||||
/* Only for QMP V6 PHY - DP PHY registers */
|
||||
#define QSERDES_V6_DP_PHY_VCO_DIV 0x070
|
||||
#define QSERDES_V6_DP_PHY_AUX_INTERRUPT_STATUS 0x0e0
|
||||
#define QSERDES_V6_DP_PHY_STATUS 0x0e4
|
||||
|
||||
|
|
Loading…
Reference in a new issue