diff options
| author | Ayushee <ayushee.shah@intel.com> | 2020-03-27 16:27:51 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-31 22:37:25 +0000 |
| commit | 1168b935921047e16761cad9596780c530044013 (patch) | |
| tree | 973d0c937f30b5fd018d33e26bd9e13e05f5221f | |
| parent | 8e78ab84c51b38f305478468a50ae268dd97fc9f (diff) | |
| download | chrome-ec-1168b935921047e16761cad9596780c530044013.tar.gz | |
Revert "volteer: Disable Burnside Bridge with TCPMv2"
This reverts commit f062e3e0e7243ee4c75f7fd0d54a4b4dadad2c21.
Reason for revert: On enabling TCPMv2 and connecting a Type-C dock to
port 1, the Burnside bridge gets set correctly.
Original change description:
> volteer: Disable Burnside Bridge with TCPMv2
>
> Burnside Bridge support has not yet been ported to TCPMv2. Don't build
> Burnside Bridge support with TCPMv2, but allow code that supports the
> USB3 daughter board to compile.
>
> BUG=b:145756626
> TEST=make buildall
> BRANCH=none
>
> Change-Id: I949cabb26779a48ce3ca3f5f3a97ccdd3f30f58d
> Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
> Reviewed-by: Keith Short <keithshort@chromium.org>
BUG=b:15030104
BRANCH=None
TEST=Tested on Volteer with TCPMv2 enabled by pluging in the Type-C dock
1. Without the monitor connected
2. With the monitor connected
The Burnside bridge works as expected. Able to get the HPD request
on connecting the monitor.
Change-Id: I69eb3605b264801c0019297f0894ff064e2af89b
Signed-off-by: Ayushee <ayushee.shah@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2125378
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | baseboard/volteer/baseboard.c | 7 | ||||
| -rw-r--r-- | baseboard/volteer/baseboard.h | 5 |
2 files changed, 1 insertions, 11 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index 57abe21bb3..decd445d1e 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -404,15 +404,12 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /******************************************************************************/ /* USBC mux configuration - Tiger Lake includes internal mux */ -#ifdef CONFIG_USBC_RETIMER_INTEL_BB -/* TODO(b/150301041): Remove #ifdefs when bb_retimer.c works with TCPMv2. */ struct usb_mux usbc1_usb_retimer = { .usb_port = USBC_PORT_C1, .driver = &bb_usb_retimer, .i2c_port = I2C_PORT_USB_1_MIX, .i2c_addr_flags = USBC_PORT_C1_BB_RETIMER_I2C_ADDR, }; -#endif struct usb_mux usb_muxes[] = { [USBC_PORT_C0] = { .usb_port = USBC_PORT_C0, @@ -423,11 +420,7 @@ struct usb_mux usb_muxes[] = { .usb_port = USBC_PORT_C1, .driver = &virtual_usb_mux_driver, .hpd_update = &virtual_hpd_update, -#ifdef CONFIG_USBC_RETIMER_INTEL_BB .next_mux = &usbc1_usb_retimer, -#else - .next_mux = NULL, -#endif }, }; BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 86963673f6..31c6f9334d 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -214,12 +214,9 @@ #define PD_VCONN_SWAP_DELAY 5000 /* us */ /* Retimer */ -#ifndef CONFIG_USB_PD_TCPMV2 -/* TODO(b/150301041): Remove #ifdefs when bb_retimer.c works with TCPMv2. */ #define CONFIG_USBC_RETIMER_INTEL_BB -#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x40 -#endif /* CONFIG_USB_PD_TCPMV2 */ #define CONFIG_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG +#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x40 /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C |