Commit 76750f1d authored by Hui Liu's avatar Hui Liu Committed by Greg Kroah-Hartman
Browse files

usb: typec: qcom: Update the logic of regulator enable and disable 



Removed the call logic of disable and enable regulator
in reset function. Enable the regulator in qcom_pmic_typec_start
function and disable it in qcom_pmic_typec_stop function to
avoid unbalanced regulator disable warnings.

Fixes: a4422ff2 ("usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
Cc: stable <stable@kernel.org>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # rb5
Signed-off-by: default avatarHui Liu <quic_huliu@quicinc.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230831-qcom-tcpc-v5-1-5e2661dc6c1d@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 427694cf

drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c

+6 −6
Original line number Diff line number Diff line
@@ -381,10 +381,6 @@ static int qcom_pmic_typec_pdphy_enable(struct pmic_typec_pdphy *pmic_typec_pdph 
	struct device *dev = pmic_typec_pdphy->dev;

	int ret;



	ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);

	if (ret)

		return ret;



	/* PD 2.0, DR=TYPEC_DEVICE, PR=TYPEC_SINK */

	ret = regmap_update_bits(pmic_typec_pdphy->regmap,

				 pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,
@@ -422,8 +418,6 @@ static int qcom_pmic_typec_pdphy_disable(struct pmic_typec_pdphy *pmic_typec_pdp 
	ret = regmap_write(pmic_typec_pdphy->regmap,

			   pmic_typec_pdphy->base + USB_PDPHY_EN_CONTROL_REG, 0);



	regulator_disable(pmic_typec_pdphy->vdd_pdphy);



	return ret;

}
@@ -447,6 +441,10 @@ int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, 
	int i;

	int ret;



	ret = regulator_enable(pmic_typec_pdphy->vdd_pdphy);

	if (ret)

		return ret;



	pmic_typec_pdphy->tcpm_port = tcpm_port;



	ret = pmic_typec_pdphy_reset(pmic_typec_pdphy);
@@ -467,6 +465,8 @@ void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy) 
		disable_irq(pmic_typec_pdphy->irq_data[i].irq);



	qcom_pmic_typec_pdphy_reset_on(pmic_typec_pdphy);



	regulator_disable(pmic_typec_pdphy->vdd_pdphy);

}



struct pmic_typec_pdphy *qcom_pmic_typec_pdphy_alloc(struct device *dev)