diff options
| author | Keith Short <keithshort@chromium.org> | 2020-05-29 16:10:45 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-02 18:52:19 +0000 |
| commit | f1c730f6eee9856e6bf42c37d01579dd1f06d8e2 (patch) | |
| tree | d806adc10cfe7891df813b7a58a1a42c22ec1af0 /baseboard/volteer/baseboard.c | |
| parent | 7229fab3bb2d4c1983dab388210eb894855aec7d (diff) | |
| download | chrome-ec-f1c730f6eee9856e6bf42c37d01579dd1f06d8e2.tar.gz | |
volteer: add support for USB4 Gen3
Latest Volteer motherboards and USB4 daughterboards support USB4 Gen3
speeds. Create new USB daughterboard type in CBI FW_CONFIG to support
this configuration.
BUG=b:157483704
BRANCH=none
TEST=make buildall
TEST=Set USB DB type to 3 (USB4_GEN3), verify TBT cable speed is
reported as Gen3 to the kernel extcon-tcss-cros-ec driver.
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I7873db70436cb9500387620a0e800c3ee79a384d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2223912
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Commit-Queue: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'baseboard/volteer/baseboard.c')
| -rw-r--r-- | baseboard/volteer/baseboard.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c index 0964f53122..2f2f3837fd 100644 --- a/baseboard/volteer/baseboard.c +++ b/baseboard/volteer/baseboard.c @@ -588,6 +588,11 @@ uint8_t get_board_id(void) return board_id; } +enum usb_db_id get_usb_db_type(void) +{ + return usb_db_type; +} + uint32_t get_fw_config(void) { return fw_config; @@ -606,6 +611,7 @@ __overridable void config_volteer_gpios(void) { } +static const char *db_type_prefix = "USB DB type: "; /* * Read CBI from i2c eeprom and initialize variables for board variants * @@ -631,7 +637,7 @@ static void cbi_init(void) /* FW config */ if (cbi_get_fw_config(&cbi_val) != EC_SUCCESS) { CPRINTS("CBI: Read FW config failed, assuming USB4"); - usb_db_val = USB_DB_USB4; + usb_db_val = USB_DB_USB4_GEN2; } else { fw_config = cbi_val; usb_db_val = CBI_FW_CONFIG_USB_DB_TYPE(cbi_val); @@ -639,17 +645,20 @@ static void cbi_init(void) switch (usb_db_val) { case USB_DB_NONE: - CPRINTS("Daughterboard type: None"); + CPRINTS("%sNone", db_type_prefix); + break; + case USB_DB_USB4_GEN2: + CPRINTS("%sUSB4 Gen1/2", db_type_prefix); break; - case USB_DB_USB4: - CPRINTS("Daughterboard type: USB4"); + case USB_DB_USB4_GEN3: + CPRINTS("%sUSB4 Gen3", db_type_prefix); break; case USB_DB_USB3: config_db_usb3(); - CPRINTS("Daughterboard type: USB3"); + CPRINTS("%sUSB3", db_type_prefix); break; default: - CPRINTS("Daughterboard ID %d not supported", usb_db_val); + CPRINTS("%sID %d not supported", db_type_prefix, usb_db_val); usb_db_val = USB_DB_NONE; } usb_db_type = usb_db_val; |