tcpc: update to tcpci RC3

Update TCPCI to match specification version RC3.

BUG=none
BRANCH=none
TEST=tested on glados and samus by plugging in a zinger with
both polarities and verifying we make a power contract.

Change-Id: I9cd6d8db7b7149995847ec1b071fba1f4d4cd5a3
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/299713
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>

2 files changed, 52 insertions, 45 deletions

diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c
index 926a1dda1b..149e7c9f5e 100644
--- a/driver/tcpm/tcpci.c
+++ b/driver/tcpm/tcpci.c
@@ -18,7 +18,7 @@
 /* Convert port number to tcpc i2c address */
 #define I2C_ADDR_TCPC(p) (CONFIG_TCPC_I2C_BASE_ADDR + 2*(p))
 
-static int tcpc_polarity, tcpc_vconn, tcpc_vbus[CONFIG_USB_PD_PORT_COUNT];
+static int tcpc_vbus[CONFIG_USB_PD_PORT_COUNT];
 
 static int init_alert_mask(int port)
 {
@@ -48,7 +48,7 @@ static int init_power_status_mask(int port)
 	uint8_t mask;
 	int rv;
 
-	mask = TCPC_REG_POWER_VBUS_PRES;
+	mask = TCPC_REG_POWER_STATUS_VBUS_PRES;
 	rv = tcpm_set_power_status_mask(port, mask);
 
 	return rv;
@@ -102,20 +102,16 @@ int tcpm_set_cc(int port, int pull)
 
 int tcpm_set_polarity(int port, int polarity)
 {
-	/* Write new polarity, leave vconn enable flag untouched */
-	tcpc_polarity = polarity;
 	return i2c_write8(I2C_PORT_TCPC, I2C_ADDR_TCPC(port),
-			  TCPC_REG_POWER_CTRL,
-			  TCPC_REG_POWER_CTRL_SET(tcpc_polarity, tcpc_vconn));
+			  TCPC_REG_TCPC_CTRL,
+			  TCPC_REG_TCPC_CTRL_SET(polarity));
 }
 
 int tcpm_set_vconn(int port, int enable)
 {
-	/* Write new vconn enable flag, leave polarity untouched */
-	tcpc_vconn = enable;
 	return i2c_write8(I2C_PORT_TCPC, I2C_ADDR_TCPC(port),
 			  TCPC_REG_POWER_CTRL,
-			  TCPC_REG_POWER_CTRL_SET(tcpc_polarity, tcpc_vconn));
+			  TCPC_REG_POWER_CTRL_SET(enable));
 }
 
 int tcpm_set_msg_header(int port, int power_role, int data_role)
@@ -246,7 +242,7 @@ void tcpc_alert(int port)
 		tcpm_get_power_status(port, &power_status);
 		/* Update VBUS status */
 		tcpc_vbus[port] = power_status &
-			TCPC_REG_POWER_VBUS_PRES ? 1 : 0;
+			TCPC_REG_POWER_STATUS_VBUS_PRES ? 1 : 0;
 #if defined(CONFIG_USB_PD_TCPM_VBUS) && defined(CONFIG_USB_CHARGER)
 		/* Update charge manager with new VBUS state */
 		usb_charger_vbus_change(port, tcpc_vbus[port]);
@@ -272,30 +268,27 @@ void tcpc_alert(int port)
 
 int tcpm_init(int port)
 {
-	int rv, err = 0;
-#ifdef CONFIG_USB_PD_TCPM_VBUS
+	int rv;
 	int power_status;
-#endif
 
 	while (1) {
-		rv = i2c_read16(I2C_PORT_TCPC, I2C_ADDR_TCPC(port),
-				TCPC_REG_ERROR_STATUS, &err);
+		rv = i2c_read8(I2C_PORT_TCPC, I2C_ADDR_TCPC(port),
+				TCPC_REG_POWER_STATUS, &power_status);
 		/*
 		 * If i2c succeeds and the uninitialized bit is clear, then
 		 * initalization is complete, clear all alert bits and write
 		 * the initial alert mask.
 		 */
-		if (rv == EC_SUCCESS && !(err & TCPC_REG_ERROR_STATUS_UNINIT)) {
+		if (rv == EC_SUCCESS &&
+		    !(power_status & TCPC_REG_POWER_STATUS_UNINIT)) {
 			i2c_write16(I2C_PORT_TCPC, I2C_ADDR_TCPC(port),
-				    TCPC_REG_ALERT, 0xff);
+				    TCPC_REG_ALERT, 0xffff);
 #ifdef CONFIG_USB_PD_TCPM_VBUS
 			/* Initialize power_status_mask */
 			init_power_status_mask(port);
-			/* Read Power Status register */
-			tcpm_get_power_status(port, &power_status);
 			/* Update VBUS status */
 			tcpc_vbus[port] = power_status &
-				TCPC_REG_POWER_VBUS_PRES ? 1 : 0;
+				TCPC_REG_POWER_STATUS_VBUS_PRES ? 1 : 0;
 #endif
 			return init_alert_mask(port);
 		}
diff --git a/driver/tcpm/tcpci.h b/driver/tcpm/tcpci.h
index cbfac0380c..da6e412669 100644
--- a/driver/tcpm/tcpci.h
+++ b/driver/tcpm/tcpci.h
@@ -14,16 +14,13 @@
 #define TCPC_REG_TC_REV            0x6
 #define TCPC_REG_PD_REV            0x8
 #define TCPC_REG_PD_INT_REV        0xa
-#define TCPC_REG_DEV_CAP_1         0xc
-#define TCPC_REG_DEV_CAP_2         0xd
-#define TCPC_REG_DEV_CAP_3         0xe
-#define TCPC_REG_DEV_CAP_4         0xf
 #define TCPC_REG_ALERT             0x10
-#define TCPC_REG_ALERT_INTRFACE_ERR (1<<11)
-#define TCPC_REG_ALERT_GPIO_CHANGE  (1<<10)
-#define TCPC_REG_ALERT_V_ALARM_LO   (1<<9)
-#define TCPC_REG_ALERT_V_ALARM_HI   (1<<8)
-#define TCPC_REG_ALERT_SLEEP_EXITED (1<<7)
+
+#define TCPC_REG_ALERT_VBUS_DISCNCT (1<<11)
+#define TCPC_REG_ALERT_RX_BUF_OVF   (1<<10)
+#define TCPC_REG_ALERT_FAULT        (1<<9)
+#define TCPC_REG_ALERT_V_ALARM_LO   (1<<8)
+#define TCPC_REG_ALERT_V_ALARM_HI   (1<<7)
 #define TCPC_REG_ALERT_TX_SUCCESS   (1<<6)
 #define TCPC_REG_ALERT_TX_DISCARDED (1<<5)
 #define TCPC_REG_ALERT_TX_FAILED    (1<<4)
@@ -37,31 +34,42 @@
 
 #define TCPC_REG_ALERT_MASK        0x12
 #define TCPC_REG_POWER_STATUS_MASK 0x14
-#define TCPC_REG_CC_STATUS         0x18
-#define TCPC_REG_CC_STATUS_SET(term, cc1, cc2) \
-		((term) << 4 | ((cc2) & 0x3) << 2 | ((cc1) & 0x3))
-#define TCPC_REG_CC_STATUS_TERM(reg) (((reg) & 0x10) >> 4)
-#define TCPC_REG_CC_STATUS_CC2(reg)  (((reg) & 0xc) >> 2)
-#define TCPC_REG_CC_STATUS_CC1(reg)  ((reg) & 0x3)
+#define TCPC_REG_FAULT_STATUS_MASK 0x15
+#define TCPC_REG_CONFIG_STD_OUTPUT 0x18
+#define TCPC_REG_TCPC_CTRL         0x19
+#define TCPC_REG_TCPC_CTRL_SET(polarity) (polarity)
+#define TCPC_REG_TCPC_CTRL_POLARITY(reg) ((reg) & 0x1)
 
-#define TCPC_REG_POWER_STATUS      0x19
-#define TCPC_REG_POWER_VBUS_PRES    (1<<5)
-#define TCPC_REG_ERROR_STATUS      0x1a
-#define TCPC_REG_ERROR_STATUS_UNINIT (1<<7)
-#define TCPC_REG_ROLE_CTRL         0x1b
+#define TCPC_REG_ROLE_CTRL         0x1a
 #define TCPC_REG_ROLE_CTRL_SET(drp, rp, cc1, cc2) \
 		((drp) << 6 | (rp) << 4 | (cc2) << 2 | (cc1))
 #define TCPC_REG_ROLE_CTRL_CC2(reg) (((reg) & 0xc) >> 2)
 #define TCPC_REG_ROLE_CTRL_CC1(reg) ((reg) & 0x3)
 
-#define TCPC_REG_POWER_PATH_CTRL   0x1c
-#define TCPC_REG_POWER_CTRL        0x1d
-#define TCPC_REG_POWER_CTRL_SET(polarity, vconn) \
-		((polarity) << 4 | (vconn))
-#define TCPC_REG_POWER_CTRL_POLARITY(reg) (((reg) & 0x10) >> 4)
+#define TCPC_REG_FAULT_CTRL        0x1b
+#define TCPC_REG_POWER_CTRL        0x1c
+#define TCPC_REG_POWER_CTRL_SET(vconn) (vconn)
 #define TCPC_REG_POWER_CTRL_VCONN(reg)    ((reg) & 0x1)
 
+#define TCPC_REG_CC_STATUS         0x1d
+#define TCPC_REG_CC_STATUS_SET(term, cc1, cc2) \
+		((term) << 4 | ((cc2) & 0x3) << 2 | ((cc1) & 0x3))
+#define TCPC_REG_CC_STATUS_TERM(reg) (((reg) & 0x10) >> 4)
+#define TCPC_REG_CC_STATUS_CC2(reg)  (((reg) & 0xc) >> 2)
+#define TCPC_REG_CC_STATUS_CC1(reg)  ((reg) & 0x3)
+
+#define TCPC_REG_POWER_STATUS      0x1e
+#define TCPC_REG_POWER_STATUS_VBUS_PRES (1<<2)
+#define TCPC_REG_POWER_STATUS_VBUS_DET  (1<<3)
+#define TCPC_REG_POWER_STATUS_UNINIT    (1<<6)
+#define TCPC_REG_FAULT_STATUS      0x1f
+
 #define TCPC_REG_COMMAND           0x23
+#define TCPC_REG_DEV_CAP_1         0x24
+#define TCPC_REG_DEV_CAP_2         0x26
+#define TCPC_REG_STD_INPUT_CAP     0x28
+#define TCPC_REG_STD_OUTPUT_CAP    0x29
+
 #define TCPC_REG_MSG_HDR_INFO      0x2e
 #define TCPC_REG_MSG_HDR_INFO_SET(drole, prole) \
 		((drole) << 3 | (PD_REV20 << 1) | (prole))
@@ -86,4 +94,10 @@
 #define TCPC_REG_TX_HDR            0x52
 #define TCPC_REG_TX_DATA           0x54 /* through 0x6f */
 
+#define TCPC_REG_VBUS_VOLTAGE                0x70
+#define TCPC_REG_VBUS_SINK_DISCONNECT_THRESH 0x72
+#define TCPC_REG_VBUS_STOP_DISCHARGE_THRESH  0x74
+#define TCPC_REG_VBUS_VOLTAGE_ALARM_HI_CFG   0x76
+#define TCPC_REG_VBUS_VOLTAGE_ALARM_LO_CFG   0x78
+
 #endif /* __CROS_EC_USB_PD_TCPM_TCPCI_H */