Commit 65145a03 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Greg Kroah-Hartman
Browse files

usb: typec: qcom-pmic-typec: fix arguments of qcom_pmic_typec_pdphy_set_roles 



The function qcom_pmic_typec_set_roles() passes enum values as boolean
values to qcom_pmic_typec_pdphy_set_roles(), which then interprets them
as bit values. Be more explicit about it, pass enum values directly and
compute corresponding bit masks in qcom_pmic_typec_pdphy_set_roles().

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20240113-pmi632-typec-v2-6-182d9aa0a5b3@linaro.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int qcom_pmic_typec_set_roles(struct tcpc_dev *tcpc, bool attached, 
	struct pmic_typec *tcpm = tcpc_to_tcpm(tcpc);



	return qcom_pmic_typec_pdphy_set_roles(tcpm->pmic_typec_pdphy,

					       data_role, power_role);

					       power_role, data_role);

}



static int qcom_pmic_typec_set_pd_rx(struct tcpc_dev *tcpc, bool on)

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

+5 −3
Original line number Diff line number Diff line
@@ -354,7 +354,8 @@ int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, b 
}



int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy,

				    bool data_role_host, bool power_role_src)

				    enum typec_role power_role,

				    enum typec_data_role data_role)

{

	struct device *dev = pmic_typec_pdphy->dev;

	unsigned long flags;
@@ -366,12 +367,13 @@ int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy, 
				 pmic_typec_pdphy->base + USB_PDPHY_MSG_CONFIG_REG,

				 MSG_CONFIG_PORT_DATA_ROLE |

				 MSG_CONFIG_PORT_POWER_ROLE,

				 data_role_host << 3 | power_role_src << 2);

				 (data_role == TYPEC_HOST ? MSG_CONFIG_PORT_DATA_ROLE : 0) |

				 (power_role == TYPEC_SOURCE ? MSG_CONFIG_PORT_POWER_ROLE : 0));



	spin_unlock_irqrestore(&pmic_typec_pdphy->lock, flags);



	dev_dbg(dev, "pdphy_set_roles: data_role_host=%d power_role_src=%d\n",

		data_role_host, power_role_src);

		data_role, power_role);



	return ret;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ int qcom_pmic_typec_pdphy_start(struct pmic_typec_pdphy *pmic_typec_pdphy, 
void qcom_pmic_typec_pdphy_stop(struct pmic_typec_pdphy *pmic_typec_pdphy);



int qcom_pmic_typec_pdphy_set_roles(struct pmic_typec_pdphy *pmic_typec_pdphy,

				    bool power_role_src, bool data_role_host);

				    enum typec_role power_role,

				    enum typec_data_role data_role);



int qcom_pmic_typec_pdphy_set_pd_rx(struct pmic_typec_pdphy *pmic_typec_pdphy, bool on);