diff options
| -rw-r--r-- | baseboard/volteer/baseboard.h | 6 | ||||
| -rw-r--r-- | board/halvor/board.h | 6 | ||||
| -rw-r--r-- | board/malefor/board.c | 29 | ||||
| -rw-r--r-- | board/volteer/board.h | 6 |
4 files changed, 13 insertions, 34 deletions
diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 01afda500e..7ce7acd673 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -193,12 +193,6 @@ #define CONFIG_CMD_USB_PD_CABLE #define CONFIG_USB_PD_DECODE_SOP -/* Enabling Thunderbolt-compatible mode */ -#define CONFIG_USB_PD_TBT_COMPAT_MODE - -/* Enabling USB4 mode */ -#define CONFIG_USB_PD_USB4 - /* UART COMMAND */ #define CONFIG_CMD_CHARGEN diff --git a/board/halvor/board.h b/board/halvor/board.h index 2b1ef9b176..ba2d6ac952 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -53,6 +53,12 @@ #define USBC_PORT_1_USB2_NUM 4 #define USBC_PORT_1_USB3_NUM 2 +/* Enabling Thunderbolt-compatible mode */ +#define CONFIG_USB_PD_TBT_COMPAT_MODE + +/* Enabling USB4 mode */ +#define CONFIG_USB_PD_USB4 + /* USB Type A Features */ /* BC 1.2 */ diff --git a/board/malefor/board.c b/board/malefor/board.c index 9d4088d0c0..4953182917 100644 --- a/board/malefor/board.c +++ b/board/malefor/board.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* Volteer board-specific configuration */ +/* Malefor board-specific configuration */ #include "button.h" #include "common.h" @@ -25,7 +25,6 @@ #include "task.h" #include "tablet_mode.h" #include "uart.h" -#include "usb_pd_tbt.h" #include "util.h" #include "gpio_list.h" /* Must come after other header files. */ @@ -48,32 +47,6 @@ static void board_init(void) } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -__override enum tbt_compat_cable_speed board_get_max_tbt_speed(int port) -{ - /* Routing length exceeds 205mm prior to connection to re-timer */ - if (port == USBC_PORT_C1) - return TBT_SS_U32_GEN1_GEN2; - - /* - * Thunderbolt-compatible mode not supported - * - * TODO (b/153996396): All the USB-C ports need to support same speed. - * Need to fix once USB-C feature set is known for Volteer. - */ - return TBT_SS_RES_0; -} - -__override bool board_is_tbt_usb4_port(int port) -{ - /* - * On the Volteer reference board only port 1 supports TBT & USB4 - * - * TODO (b/153996396): All the USB-C ports need to support same - * features. Need to fix once USB-C feature set is known for Volteer. - */ - return port == USBC_PORT_C1; -} - /******************************************************************************/ /* Sensors */ /* Lid and base Sensor mutex */ diff --git a/board/volteer/board.h b/board/volteer/board.h index 5a467a441d..52e36fc308 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -58,6 +58,12 @@ #define USBC_PORT_1_USB2_NUM 4 #define USBC_PORT_1_USB3_NUM 2 +/* Enabling Thunderbolt-compatible mode */ +#define CONFIG_USB_PD_TBT_COMPAT_MODE + +/* Enabling USB4 mode */ +#define CONFIG_USB_PD_USB4 + /* USB Type A Features */ /* BC 1.2 */ |