Commit cb225582 authored by Xiangxu Yin's avatar Xiangxu Yin Committed by Vinod Koul
Browse files

phy: qcom: qmp-usbc: Move USB-only init to usb_power_on 



The current implementation programs USB-specific registers in
qmp_usbc_com_init(), which is shared by both USB and DP modes. This
causes unnecessary configuration when the PHY is used for DP.

Move USB-only register setup from com_init to qmp_usbc_usb_power_on,
so it runs only for USB mode.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarXiangxu Yin <xiangxu.yin@oss.qualcomm.com>
Link: https://patch.msgid.link/20251215-add-displayport-support-for-qcs615-platform-v8-7-cbc72c88a44e@oss.qualcomm.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 049e708e

drivers/phy/qualcomm/phy-qcom-qmp-usbc.c

+10 −12
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include "phy-qcom-qmp-pcs-misc-v3.h"



#define PHY_INIT_COMPLETE_TIMEOUT		10000

#define SW_PORTSELECT_VAL			BIT(0)

#define SW_PORTSELECT_MUX			BIT(1)



/* set of registers with offsets different per-PHY */

enum qphy_reg_layout {
@@ -531,8 +533,6 @@ static int qmp_usbc_com_init(struct phy *phy) 
{

	struct qmp_usbc *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	void __iomem *pcs = qmp->pcs;

	u32 val = 0;

	int ret;



	ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);
@@ -557,16 +557,6 @@ static int qmp_usbc_com_init(struct phy *phy) 
	if (ret)

		goto err_assert_reset;



	qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN);



#define SW_PORTSELECT_VAL			BIT(0)

#define SW_PORTSELECT_MUX			BIT(1)

	/* Use software based port select and switch on typec orientation */

	val = SW_PORTSELECT_MUX;

	if (qmp->orientation == TYPEC_ORIENTATION_REVERSE)

		val |= SW_PORTSELECT_VAL;

	writel(val, qmp->pcs_misc);



	return 0;



err_assert_reset:
@@ -599,6 +589,14 @@ static int qmp_usbc_usb_power_on(struct phy *phy) 
	unsigned int val;

	int ret;



	qphy_setbits(qmp->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], SW_PWRDN);



	/* Use software based port select and switch on typec orientation */

	val = SW_PORTSELECT_MUX;

	if (qmp->orientation == TYPEC_ORIENTATION_REVERSE)

		val |= SW_PORTSELECT_VAL;

	writel(val, qmp->pcs_misc);



	qmp_configure(qmp->dev, qmp->serdes, cfg->serdes_tbl,

		      cfg->serdes_tbl_num);