diff options
| author | Scott Collyer <scollyer@google.com> | 2019-05-28 16:16:46 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-15 00:05:00 +0000 |
| commit | a5e4ad34e7301acccba31e1e7a9c94258e7973da (patch) | |
| tree | 4c8e2408150e8d85bfc0d7b4163bf812f8173fae /board | |
| parent | 118975fb5985550abb88d2a2fea525c7f31f9852 (diff) | |
| download | chrome-ec-a5e4ad34e7301acccba31e1e7a9c94258e7973da.tar.gz | |
helios: Change port 0 TCPC from ANX7447 to PS8751
This CL changes the TCPC config for port 0 from the ANX7447 to the
PS8751. It includes changing the gpio name for the reset to reflect
that it's active low instead of active high.
BUG=b:133501368
BRANCH=none
TEST=make -j BOARD=helios
Change-Id: Ic96b8e9ddbf229c251cae3db4a70feb7b7e83765
Signed-off-by: Scott Collyer <scollyer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1633910
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Scott Collyer <scollyer@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/helios/board.c | 10 | ||||
| -rw-r--r-- | board/helios/board.h | 6 | ||||
| -rw-r--r-- | board/helios/gpio.inc | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/board/helios/board.c b/board/helios/board.c index 55359affdb..e7b51f83b8 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -15,7 +15,6 @@ #include "driver/als_opt3001.h" #include "driver/bc12/pi3usb9201.h" #include "driver/ppc/sn5s330.h" -#include "driver/tcpm/anx7447.h" #include "driver/tcpm/ps8xxx.h" #include "driver/tcpm/tcpci.h" #include "ec_commands.h" @@ -125,10 +124,9 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { .port = I2C_PORT_TCPC0, - .addr = AN7447_TCPC0_I2C_ADDR, + .addr = PS8751_I2C_ADDR1, }, - .drv = &anx7447_tcpm_drv, - .flags = TCPC_FLAGS_RESET_ACTIVE_HIGH, + .drv = &ps8xxx_tcpm_drv, }, [USB_PD_PORT_TCPC_1] = { .bus_type = EC_BUS_TYPE_I2C, @@ -142,8 +140,8 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { [USB_PD_PORT_TCPC_0] = { - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, }, [USB_PD_PORT_TCPC_1] = { .driver = &tcpci_tcpm_usb_mux_driver, diff --git a/board/helios/board.h b/board/helios/board.h index ff0b803a09..e353ce9e4b 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -50,12 +50,12 @@ #define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1 /* USB Type C and USB PD defines */ -#define CONFIG_USB_PD_TCPM_ANX7447 #define CONFIG_USB_PD_TCPM_PS8751 -#define BOARD_TCPC_C0_RESET_HOLD_DELAY ANX74XX_RESET_HOLD_MS -#define BOARD_TCPC_C0_RESET_POST_DELAY ANX74XX_RESET_HOLD_MS +#define BOARD_TCPC_C0_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS +#define BOARD_TCPC_C0_RESET_POST_DELAY 0 #define BOARD_TCPC_C1_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS #define BOARD_TCPC_C1_RESET_POST_DELAY 0 +#define GPIO_USB_C0_TCPC_RST GPIO_USB_C0_TCPC_RST_ODL #define GPIO_USB_C1_TCPC_RST GPIO_USB_C1_TCPC_RST_ODL /* USB Type A Features */ diff --git a/board/helios/gpio.inc b/board/helios/gpio.inc index c6e9b8b911..a6d1b62691 100644 --- a/board/helios/gpio.inc +++ b/board/helios/gpio.inc @@ -57,7 +57,7 @@ GPIO(EC_INT_L, PIN(7, 0), GPIO_ODR_HIGH) /* USB and USBC Signals */ GPIO(USB_C_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) -GPIO(USB_C0_TCPC_RST, PIN(9, 7), GPIO_OUT_LOW) +GPIO(USB_C0_TCPC_RST_ODL, PIN(9, 7), GPIO_ODR_HIGH) GPIO(USB_C1_TCPC_RST_ODL, PIN(3, 2), GPIO_ODR_HIGH) GPIO(EN_USB_A_5V, PIN(3, 5), GPIO_OUT_LOW) GPIO(EN_USB_A_LOW_PWR_OD, PIN(9, 4), GPIO_OUT_LOW) |