diff options
| author | Jacky Wang <jacky5_wang@pegatron.corp-partner.google.com> | 2021-08-02 09:43:10 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-06 03:40:20 +0000 |
| commit | a447f03e46ee661bbe8ebd48d650ef2af7c88024 (patch) | |
| tree | 839e74ac9ce5d935555434a6feca65440c4fb5c4 | |
| parent | 9c113758a453275f53ee15e25adfdd515942446c (diff) | |
| download | chrome-ec-a447f03e46ee661bbe8ebd48d650ef2af7c88024.tar.gz | |
collis: Remove TBT/USB4 setting
1. Disable Thunderbolt-compatible mode
2. Disable USB4 mode
BUG=b:188021567
BRANCH=firmware-volteer-13672.B
TEST=make BOARD=collis
1. Verified pass by QTC.
Signed-off-by: Jacky Wang <jacky5_wang@pegatron.corp-partner.google.com>
Change-Id: Ic6730be5667dcf0d6d86b9e0f7ca372fb709a380
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3063862
Reviewed-by: Keith Short <keithshort@chromium.org>
(cherry picked from commit 64f58714a53e0be3b85af502d175c6c78b01ed1f)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3073705
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Commit-Queue: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | board/collis/board.c | 13 | ||||
| -rw-r--r-- | board/collis/board.h | 9 |
2 files changed, 2 insertions, 20 deletions
diff --git a/board/collis/board.c b/board/collis/board.c index 5f643c8aa7..76cffc4d22 100644 --- a/board/collis/board.c +++ b/board/collis/board.c @@ -4,7 +4,6 @@ */ /* Volteer board-specific configuration */ -#include "bb_retimer.h" #include "button.h" #include "common.h" #include "accelgyro.h" @@ -15,7 +14,6 @@ #include "driver/ppc/syv682x.h" #include "driver/tcpm/ps8xxx.h" #include "driver/tcpm/tcpci.h" -#include "driver/retimer/bb_retimer.h" #include "driver/sync.h" #include "extpower.h" #include "fan.h" @@ -341,17 +339,6 @@ const struct usb_mux usb_muxes[] = { }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); -struct bb_usb_control bb_controls[] = { - [USBC_PORT_C0] = { - /* USB-C port 0 doesn't have a retimer */ - }, - [USBC_PORT_C1] = { - .usb_ls_en_gpio = GPIO_USB_C1_LS_EN, - .retimer_rst_gpio = GPIO_USB_C1_RT_RST_ODL, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(bb_controls) == USBC_PORT_COUNT); - static void board_tcpc_init(void) { /* Don't reset TCPCs after initial reset */ diff --git a/board/collis/board.h b/board/collis/board.h index 8d7772f2ae..03f0f023ea 100644 --- a/board/collis/board.h +++ b/board/collis/board.h @@ -79,13 +79,8 @@ #define PD_MAX_CURRENT_MA 3000 #define PD_MAX_VOLTAGE_MV 20000 -/* Enabling Thunderbolt-compatible mode */ -#define CONFIG_USB_PD_TBT_COMPAT_MODE - -/* Enabling USB4 mode */ -#define CONFIG_USB_PD_USB4 -#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x40 -#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x40 +#undef CONFIG_USBC_RETIMER_INTEL_BB +#undef CONFIG_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG /* USB Type A Features */ #define USB_PORT_COUNT 1 |