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

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

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/typec/tcpci.c b/drivers/staging/typec/tcpci.c
index 4d3b0ae..11c2d37 100644 (file)
--- a/drivers/staging/typec/tcpci.c
+++ b/drivers/staging/typec/tcpci.c
@@ -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)