bip: use ITE as TCPC driver for C1

The PS8751 is only being used as mux with the option of
being a TCPC is we stuff resistor on the subboard. The
default resistor configuration uses ITE EC as C1 TCPC.

BRANCH=NONE
BUG=b:78341944
TEST=none

Change-Id: I4ccad314fa7eec0d205a155e42e52109cff5811f
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1024487

2 files changed, 19 insertions, 17 deletions

diff --git a/board/bip/board.c b/board/bip/board.c
index 11985d97b0..7a29ac0fcb 100644
--- a/board/bip/board.c
+++ b/board/bip/board.c
@@ -99,21 +99,20 @@ const struct i2c_port_t i2c_ports[] = {
 };
 const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports);
 
-#define USB_PD_PORT_0_ITE 0
-#define USB_PD_PORT_1_PS8751 1
+#define USB_PD_PORT_0 0
+#define USB_PD_PORT_1 1
 
 /******************************************************************************/
 /* USB-C TCPC config. */
 const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = {
-	[USB_PD_PORT_0_ITE] = {
+	[USB_PD_PORT_0] = {
 		/* TCPC is embedded within EC so no i2c config needed */
 		.drv = &it83xx_tcpm_drv,
 		.pol = TCPC_ALERT_ACTIVE_LOW,
 	},
-	[USB_PD_PORT_1_PS8751] = {
-		.i2c_host_port = I2C_PORT_USBC1,
-		.i2c_slave_addr = PS8751_I2C_ADDR1,
-		.drv = &ps8xxx_tcpm_drv,
+	[USB_PD_PORT_1] = {
+		/* TCPC is embedded within EC so no i2c config needed */
+		.drv = &it83xx_tcpm_drv,
 		.pol = TCPC_ALERT_ACTIVE_LOW,
 	},
 };
@@ -123,14 +122,16 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = {
 static void board_it83xx_hpd_status(int port, int hpd_lvl, int hpd_irq);
 
 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
-	[USB_PD_PORT_0_ITE] = {
+	[USB_PD_PORT_0] = {
 		/* Driver uses I2C_PORT_USB_MUX as I2C port */
 		.port_addr = IT5205_I2C_ADDR1,
 		.driver = &it5205_usb_mux_driver,
 		.hpd_update = &board_it83xx_hpd_status,
 	},
-	[USB_PD_PORT_1_PS8751] = {
-		.port_addr = USB_PD_PORT_1_PS8751,
+	[USB_PD_PORT_1] = {
+		/* Use PS8751 as mux only */
+		.port_addr = MUX_PORT_AND_ADDR(
+			I2C_PORT_USBC1, PS8751_I2C_ADDR1),
 		.driver = &tcpci_tcpm_usb_mux_driver,
 		.hpd_update = &board_it83xx_hpd_status,
 	}
@@ -139,12 +140,12 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 /******************************************************************************/
 /* USB-C PPC config */
 const struct ppc_config_t ppc_chips[CONFIG_USB_PD_PORT_COUNT] = {
-	[USB_PD_PORT_0_ITE] = {
+	[USB_PD_PORT_0] = {
 		.i2c_port = I2C_PORT_USBC0,
 		.i2c_addr = SN5S330_ADDR0,
 		.drv = &sn5s330_drv
 	},
-	[USB_PD_PORT_1_PS8751] = {
+	[USB_PD_PORT_1] = {
 		.i2c_port = I2C_PORT_USBC1,
 		.i2c_addr = SN5S330_ADDR0,
 		.drv = &sn5s330_drv
@@ -155,12 +156,12 @@ const unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
 /******************************************************************************/
 /* USB-C BC 1.2 chip Configuration */
 const struct bq24392_config_t bq24392_config[CONFIG_USB_PD_PORT_COUNT] = {
-	[USB_PD_PORT_0_ITE] = {
+	[USB_PD_PORT_0] = {
 		.chip_enable_pin = GPIO_USB_C0_BC12_VBUS_ON,
 		.chg_det_pin = GPIO_USB_C0_BC12_CHG_DET_L,
 		.flags = BQ24392_FLAGS_CHG_DET_ACTIVE_LOW,
 	},
-	[USB_PD_PORT_1_PS8751] = {
+	[USB_PD_PORT_1] = {
 		.chip_enable_pin = GPIO_USB_C1_BC12_VBUS_ON,
 		.chg_det_pin = GPIO_USB_C1_BC12_CHG_DET_L,
 		.flags = BQ24392_FLAGS_CHG_DET_ACTIVE_LOW,
diff --git a/board/bip/board.h b/board/bip/board.h
index ad1a230595..2288e72c44 100644
--- a/board/bip/board.h
+++ b/board/bip/board.h
@@ -54,11 +54,12 @@
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_COMM_LOCKED
 #define CONFIG_USB_PD_TCPC_LOW_POWER
-#define CONFIG_USB_PD_TCPM_ITE83XX	/* C0 TPCP: ITE EC */
-#define CONFIG_USB_MUX_IT5205		/* C0 MUX:  IT5205 */
-#define CONFIG_USB_PD_TCPM_PS8751	/* C1 TCPC & Mux: single PS8751 */
+#define CONFIG_USB_PD_TCPM_ITE83XX	/* C0 & C1 TCPC: ITE EC */
+#define CONFIG_USB_MUX_IT5205		/* C0 MUX: IT5205 */
+#define CONFIG_USB_PD_TCPM_PS8751	/* C1 Mux: PS8751 */
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TCPM_MUX
+#define CONFIG_USB_PD_TCPM_TCPCI_MUX_ONLY
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_PPC_SN5S330		/* C0 & C1 PPC: each SN5S330 */