diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2021-01-27 14:11:58 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-29 01:50:33 +0000 |
| commit | 3ea69a5c8a038a312bdd051f9d521f7eb5d626a6 (patch) | |
| tree | 1e93a99695a5e52b5a7d84270836c35a0e76a077 | |
| parent | 04661a072ecc00ef42112ceb223095808190ff68 (diff) | |
| download | chrome-ec-3ea69a5c8a038a312bdd051f9d521f7eb5d626a6.tar.gz | |
vilboz: replace obsolete dalboz config macros
Vilboz inherited the mb and db type macros from dalboz when it was
created by copying dalboz; replace it with correct definitions for
vilboz in accordance with the project config.
BUG=b:178457388
TEST=builds
BRANCH=zork
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Change-Id: I00fb2948ba68e1d4d68499e35911eb9072d3e75d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2649897
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | board/vilboz/board.h | 56 |
1 files changed, 7 insertions, 49 deletions
diff --git a/board/vilboz/board.h b/board/vilboz/board.h index 8d0eab34cc..3babb9bbc7 100644 --- a/board/vilboz/board.h +++ b/board/vilboz/board.h @@ -131,7 +131,7 @@ enum usbc_port { #include "cbi_ec_fw_config.h" /** - * DALBOZ_MB_USBAC + * VILBOZ_MB_USBAC * USB-A0 Speed: 5 Gbps * Retimer: none * USB-C0 Speed: 5 Gbps @@ -141,63 +141,21 @@ enum usbc_port { * IOEX: TCPC */ enum ec_cfg_usb_mb_type { - DALBOZ_MB_USBAC = 0, + VILBOZ_MB_USBAC = 0, }; /** - * DALBOZ_DB_D_OPT1_USBAC + * VILBOZ_DB_D_OPT1_USBA_HDMI * USB-A1 Speed: 5 Gbps - * Retimer: TUSB522 - * USB-C1 Speed: 5 Gbps - * Retimer: PS8740 - * TCPC: NCT3807 - * PPC: NX20P3483 - * IOEX: TCPC - * HDMI Exists: no - * Retimer: none - * MST Hub: none - * - * DALBOZ_DB_D_OPT2_USBA_HDMI - * USB-A1 Speed: 5 Gbps - * Retimer: TUSB522 - * USB-C1 none - * IOEX: PCAL6408 - * HDMI Exists: yes - * Retimer: PI3HDX1204 + * Retimer: None + * HDMI Retimer: PS8203 * MST Hub: none + * P-Sensor SX9324 */ enum ec_cfg_usb_db_type { - DALBOZ_DB_D_OPT1_USBAC = 0, - DALBOZ_DB_D_OPT2_USBA_HDMI = 1, + VILBOZ_DB_D_OPT1_USBA_HDMI = 0, }; -#define HAS_USBC1 \ - (BIT(DALBOZ_DB_D_OPT1_USBAC)) - -static inline bool ec_config_has_usbc1(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1); -} - -#define HAS_USBC1_RETIMER_PS8740 \ - (BIT(DALBOZ_DB_D_OPT1_USBAC)) - -static inline bool ec_config_has_usbc1_retimer_ps8740(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1_RETIMER_PS8740); -} - -#define HAS_HDMI_RETIMER_PI3HDX1204 \ - (BIT(DALBOZ_DB_D_OPT2_USBA_HDMI)) - -static inline bool ec_config_has_hdmi_retimer_pi3hdx1204(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_HDMI_RETIMER_PI3HDX1204); -} - void board_reset_pd_mcu(void); /* Common definition for the USB PD interrupt handlers. */ |