usbc: tcpc: Update set_drp_toggle function

Updated set_drp_toggle to handle differences in TCPCI revisions.
Added a macro for TCPCI revision and read it from the chip register
during initialization.

Signed-off-by: Jianxiong Gu <[email protected]>

Author: recalci

drivers/usb_c/tcpc/rt1715.c

@@ -26,6 +26,8 @@ struct rt1715_data {
 	int init_retries;
 	/** Boolean value if chip was successfully initialized */
 	bool initialized;
+	/** TCPCI Specification Revision */
+	uint8_t pd_int_rev;
 
 	/** Callback for alert GPIO */
 	struct gpio_callback alert_cb;
@@ -414,8 +416,9 @@ static int rt1715_tcpc_mask_status_register(const struct device *dev, enum tcpc_
 static int rt1715_tcpc_set_drp_toggle(const struct device *dev, bool enable)
 {
 	const struct rt1715_cfg *cfg = dev->config;
+	const struct rt1715_data *data = dev->data;
 
-	return tcpci_tcpm_set_drp_toggle(&cfg->bus, enable);
+	return tcpci_tcpm_set_drp_toggle(&cfg->bus, data->pd_int_rev, enable);
 }
 
 static int rt1715_tcpc_get_chip_info(const struct device *dev, struct tcpc_chip_info *chip_info)
@@ -585,6 +588,7 @@ void rt1715_init_work_cb(struct k_work *work)
 	const struct rt1715_cfg *cfg = data->dev->config;
 	uint8_t power_reg, lp_reg = 0;
 	struct tcpc_chip_info chip_info;
+	uint16_t tcpci_rev;
 	int ret;
 
 	LOG_INF("Initializing RT1715 chip: %s", data->dev->name);
@@ -608,6 +612,11 @@ void rt1715_init_work_cb(struct k_work *work)
 	LOG_INF("Initialized chip is: %04x:%04x:%04x", chip_info.vendor_id, chip_info.product_id,
 		chip_info.device_id);
 
+	/* get TCPCI Specification Revision */
+	tcpci_read_reg16(&cfg->bus, TCPC_REG_PD_INT_REV, &tcpci_rev);
+	data->pd_int_rev = TCPC_REG_PD_INT_REV_REV_MAJOR(tcpci_rev) << 4 |
+			   TCPC_REG_PD_INT_REV_REV_MINOR(tcpci_rev);
+
 	/* Exit shutdown mode & Enable ext messages */
 	lp_reg = RT1715_REG_LP_CTRL_SHUTDOWN_OFF | RT1715_REG_LP_CTRL_ENEXTMSG;
 	/* Disable idle mode */

drivers/usb_c/tcpc/tcpci.c

@@ -598,10 +598,36 @@ int tcpci_tcpm_set_roles(const struct i2c_dt_spec *bus, enum pd_rev_type pd_rev,
 				 TCPC_REG_MSG_HDR_INFO_SET(pd_rev, data_role, power_role));
 }
 
-int tcpci_tcpm_set_drp_toggle(const struct i2c_dt_spec *bus, bool enable)
+int tcpci_tcpm_set_drp_toggle(const struct i2c_dt_spec *bus, uint8_t pd_int_rev, bool enable)
 {
-	return tcpci_update_reg8(bus, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_DRP_MASK,
-				 TCPC_REG_ROLE_CTRL_SET(enable, 0, 0, 0));
+	int ret;
+
+	/* Set auto drp toggle */
+	ret = tcpci_update_reg8(bus, TCPC_REG_ROLE_CTRL, TCPC_REG_ROLE_CTRL_DRP_MASK,
+				TCPC_REG_ROLE_CTRL_SET(enable, 0, 0, 0));
+	if (ret != 0) {
+		return ret;
+	}
+
+	/*
+	 * For TCPCI Rev 2.0, unless the TCPM sets TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT,
+	 * TCPC by default masks Alert assertion when CC_STATUS_LOOK4CONNECTION changes state.
+	 */
+	if (pd_int_rev >= PD_INT_REV20) {
+		ret = tcpci_update_reg8(bus, TCPC_REG_TCPC_CTRL,
+					TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT,
+					enable ? TCPC_REG_TCPC_CTRL_EN_LOOK4CONNECTION_ALERT : 0);
+		if (ret != 0) {
+			return ret;
+		}
+	}
+
+	if (enable) {
+		/* Set Look4Connection command */
+		return tcpci_write_reg8(bus, TCPC_REG_COMMAND, TCPC_REG_COMMAND_LOOK4CONNECTION);
+	}
+
+	return 0;
 }
 
 int tcpci_tcpm_set_rx_type(const struct i2c_dt_spec *bus, uint8_t rx_type)

include/zephyr/drivers/usb_c/tcpci_priv.h

@@ -41,6 +41,10 @@ struct tcpci_reg_dump_map {
  */
 extern const struct tcpci_reg_dump_map tcpci_std_regs[TCPCI_STD_REGS_SIZE];
 
+/** Type-C Port Controller Interface Specification Revision */
+#define PD_INT_REV10 0x10 /* Revision 1.0 */
+#define PD_INT_REV20 0x20 /* Revision 2.0 */
+
 /**
  * @brief Function to read the 8-bit register of TCPCI device
  *
@@ -185,10 +189,11 @@ int tcpci_tcpm_set_cc(const struct i2c_dt_spec *bus, enum tc_cc_pull pull);
  * @brief Function to enable or disable TCPC auto dual role toggle.
  *
  * @param bus I2C bus
+ * @param pd_int_rev Value of the TCPC_REG_PD_INT_REV bits [15..8]
  * @param enable Boolean flag to enable (true) or disable (false) DRP toggle mode
  * @return int Status of I2C operation, 0 in case of success
  */
-int tcpci_tcpm_set_drp_toggle(const struct i2c_dt_spec *bus, bool enable);
+int tcpci_tcpm_set_drp_toggle(const struct i2c_dt_spec *bus, uint8_t pd_int_rev, bool enable);
 
 /**
  * @brief Function to set the power and data role of the PD message header.