diff options
author | AlvinCC_Hsu <alvincc_hsu@compal.corp-partner.google.com> | 2020-09-03 09:22:18 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-09-04 00:59:35 +0000 |
commit | 94f6a302dff4166f35181dcc09a3b2efac39ff53 (patch) | |
tree | 63569ae0fc75e18aaff4b14269bcf8ea3684adc0 /baseboard/trogdor | |
parent | 5a0919d5d2bc4ed9cd2655181aa1024dfe46d83f (diff) | |
download | chrome-ec-94f6a302dff4166f35181dcc09a3b2efac39ff53.tar.gz |
pompom: Remove TCPC port1 configuration
This patch removes configurations (I2C, GPIO, TASK and
Interrupt...) about TCPC port1 for pompom.
BUG=b:167476139
BRANCH=none
TEST=power on after flashing FW and it works normal.
Signed-off-by: AlvinCC_Hsu <alvincc_hsu@compal.corp-partner.google.com>
Change-Id: I1275c1ef7e7d3e65d695dace834a9bcbb4e66dcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2391022
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Diffstat (limited to 'baseboard/trogdor')
-rw-r--r-- | baseboard/trogdor/baseboard.c | 2 | ||||
-rw-r--r-- | baseboard/trogdor/baseboard.h | 1 | ||||
-rw-r--r-- | baseboard/trogdor/usb_pd_policy.c | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/baseboard/trogdor/baseboard.c b/baseboard/trogdor/baseboard.c index 7f11f1f876..abe6ff72e7 100644 --- a/baseboard/trogdor/baseboard.c +++ b/baseboard/trogdor/baseboard.c @@ -58,8 +58,10 @@ const struct i2c_port_t i2c_ports[] = { GPIO_EC_I2C_POWER_SDA}, {"tcpc0", I2C_PORT_TCPC0, 1000, GPIO_EC_I2C_USB_C0_PD_SCL, GPIO_EC_I2C_USB_C0_PD_SDA}, +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 {"tcpc1", I2C_PORT_TCPC1, 1000, GPIO_EC_I2C_USB_C1_PD_SCL, GPIO_EC_I2C_USB_C1_PD_SDA}, +#endif {"eeprom", I2C_PORT_EEPROM, 400, GPIO_EC_I2C_EEPROM_SCL, GPIO_EC_I2C_EEPROM_SDA}, {"sensor", I2C_PORT_SENSOR, 400, GPIO_EC_I2C_SENSOR_SCL, diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h index b608b60f4d..f5adacbcd2 100644 --- a/baseboard/trogdor/baseboard.h +++ b/baseboard/trogdor/baseboard.h @@ -103,7 +103,6 @@ #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_LOGGING #define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 -#define CONFIG_USB_PD_PORT_MAX_COUNT 2 #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_CMD_TCPC_DUMP diff --git a/baseboard/trogdor/usb_pd_policy.c b/baseboard/trogdor/usb_pd_policy.c index dc4733d20d..9230332a3e 100644 --- a/baseboard/trogdor/usb_pd_policy.c +++ b/baseboard/trogdor/usb_pd_policy.c @@ -22,8 +22,12 @@ int pd_check_vconn_swap(int port) } static uint8_t vbus_en[CONFIG_USB_PD_PORT_MAX_COUNT]; +#if CONFIG_USB_PD_PORT_MAX_COUNT == 1 +static uint8_t vbus_rp[CONFIG_USB_PD_PORT_MAX_COUNT] = {TYPEC_RP_1A5}; +#else static uint8_t vbus_rp[CONFIG_USB_PD_PORT_MAX_COUNT] = {TYPEC_RP_1A5, TYPEC_RP_1A5}; +#endif static void board_vbus_update_source_current(int port) { @@ -88,8 +92,12 @@ __override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) int pd_snk_is_vbus_provided(int port) { +#if CONFIG_USB_PD_PORT_MAX_COUNT == 1 + return !gpio_get_level(GPIO_USB_C0_VBUS_DET_L); +#else return !gpio_get_level(port ? GPIO_USB_C1_VBUS_DET_L : GPIO_USB_C0_VBUS_DET_L); +#endif } /* ----------------- Vendor Defined Messages ------------------ */ |