Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af50c29 authored by Li Jun's avatar Li Jun Committed by Greg Kroah-Hartman
Browse files

staging: typec: tcpci: keep the disconnected cc line open 



While set polarity, we should keep the disconnected cc line to be
open.

Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarLi Jun <jun.li@nxp.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e04b372

drivers/staging/typec/tcpci.c

+14 −4
Original line number Diff line number Diff line
@@ -185,15 +185,25 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc, 
			      enum typec_cc_polarity polarity)

{

	struct tcpci *tcpci = tcpc_to_tcpci(tcpc);

	unsigned int reg;

	int ret;



	ret = regmap_write(tcpci->regmap, TCPC_TCPC_CTRL,

			   (polarity == TYPEC_POLARITY_CC2) ?

			   TCPC_TCPC_CTRL_ORIENTATION : 0);

	/* Keep the disconnect cc line open */

	ret = regmap_read(tcpci->regmap, TCPC_ROLE_CTRL, &reg);

	if (ret < 0)

		return ret;



	return 0;

	if (polarity == TYPEC_POLARITY_CC2)

		reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT;

	else

		reg |= TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT;

	ret = regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg);

	if (ret < 0)

		return ret;



	return regmap_write(tcpci->regmap, TCPC_TCPC_CTRL,

			   (polarity == TYPEC_POLARITY_CC2) ?

			   TCPC_TCPC_CTRL_ORIENTATION : 0);

}



static int tcpci_set_vconn(struct tcpc_dev *tcpc, bool enable)