diff options
| author | Keith Short <keithshort@chromium.org> | 2020-06-15 10:50:25 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-02 02:40:30 +0000 |
| commit | 6df13c713468411000f4cd3a55afed1a5976ed93 (patch) | |
| tree | d78a56c3eca73882aa8bde5f34cba298155c5942 | |
| parent | 07f8dada148b8a0cc5ab09c7a47e53aeec184ec7 (diff) | |
| download | chrome-ec-6df13c713468411000f4cd3a55afed1a5976ed93.tar.gz | |
trondo: Move USB DB checks from baseboard
Update Trondo USB daughterboard options to match project configuration.
BUG=b:155497872
BRANCH=none
TEST=make BOARD=trondo
Cq-Depend: chromium:2247617, chromium:2248238, chromium:2248239
Cq-Depend: chromium:2248240, chromium:2248242, chromium:2252484
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: Id8eae5f4b372c6406fee5afeffa88bdcf2393931
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2248241
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
| -rw-r--r-- | board/trondo/board.c | 32 | ||||
| -rw-r--r-- | board/trondo/board.h | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/board/trondo/board.c b/board/trondo/board.c index 66056e99d5..e4635a0237 100644 --- a/board/trondo/board.c +++ b/board/trondo/board.c @@ -8,6 +8,7 @@ #include "button.h" #include "common.h" #include "accelgyro.h" +#include "cbi_ec_fw_config.h" #include "driver/accel_bma2x2.h" #include "driver/accelgyro_bmi260.h" #include "driver/als_tcs3400.h" @@ -37,24 +38,11 @@ #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args) /* - * Reconfigure Volteer GPIOs based on the board ID + * FW_CONFIG defaults for Trondo if the CBI data is not initialized. */ -__override void config_volteer_gpios(void) -{ - /* Legacy support for the first board build */ - if (get_board_id() == 0) { - CPRINTS("Configuring GPIOs for board ID 0"); - - /* Reassign USB_C1_RT_RST_ODL */ - bb_controls[USBC_PORT_C1].retimer_rst_gpio = - GPIO_USB_C1_RT_RST_ODL_BOARDID_0; - ps8xxx_rst_odl = GPIO_USB_C1_RT_RST_ODL_BOARDID_0; - - /* Reassign EC_VOLUP_BTN_ODL */ - button_reassign_gpio(BUTTON_VOLUME_UP, - GPIO_EC_VOLUP_BTN_ODL_BOARDID_0); - } -} +union volteer_cbi_fw_config fw_config_defaults = { + .usb_db = DB_USB3_PASSIVE, +}; static void board_init(void) { @@ -223,3 +211,13 @@ const struct pwm_t pwm_channels[] = { }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); + +void board_reset_pd_mcu(void) +{ + /* TODO(b/159025023): Trondo: check USB PD reset operation */ +} + +__override void board_cbi_init(void) +{ + /* TODO(b/159025023): Trondo: check FW_CONFIG fields for USB DB type */ +} diff --git a/board/trondo/board.h b/board/trondo/board.h index bff0da6df9..4495625709 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -155,6 +155,8 @@ enum sensor_id { /* TODO: b/143375057 - Remove this code after power on. */ void c10_gate_change(enum gpio_signal signal); +void board_reset_pd_mcu(void); + #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ |