diff options
| author | Tommy Chung <tommy.chung@quanta.corp-partner.google.com> | 2021-05-18 14:39:16 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-26 03:59:43 +0000 |
| commit | ae74170e09bc27b80f972bcaf22a3cac83cea6e5 (patch) | |
| tree | 38d6e98326270663edaa28a76f50b30f8843f652 /board | |
| parent | a51cbc7f01d8b2b28b09cd33b55095698bfa783a (diff) | |
| download | chrome-ec-ae74170e09bc27b80f972bcaf22a3cac83cea6e5.tar.gz | |
lantis: Update fw_config_db
Update fw_config_db to meet cbi_fw_config table on lantis.
BUG=b:186393848
BRANCH=dedede
TEST=on lantis, make sure that all DB configs act correctly.
Signed-off-by: Tommy Chung <tommy.chung@quanta.corp-partner.google.com>
Change-Id: I7cade5d603f815a60ba89c6cdf86ac48b41eafe3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2902073
Reviewed-by: Henry Sun <henrysun@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Henry Sun <henrysun@google.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/lantis/board.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/board/lantis/board.c b/board/lantis/board.c index cd02a4fd91..8bd879e610 100644 --- a/board/lantis/board.c +++ b/board/lantis/board.c @@ -138,9 +138,10 @@ static void usb_c1_interrupt(enum gpio_signal s) static void button_sub_hdmi_hpd_interrupt(enum gpio_signal s) { + enum fw_config_db db = get_cbi_fw_config_db(); int hdmi_hpd = gpio_get_level(GPIO_VOLUP_BTN_ODL_HDMI_HPD); - if (get_cbi_fw_config_db() == DB_1A_HDMI) + if (db == DB_1A_HDMI || db == DB_LTE_HDMI || db == DB_1A_HDMI_LTE) gpio_set_level(GPIO_EC_AP_USB_C1_HDMI_HPD, hdmi_hpd); else button_interrupt(s); @@ -395,8 +396,9 @@ __override const struct ec_response_keybd_config void board_init(void) { int on; + enum fw_config_db db = get_cbi_fw_config_db(); - if (get_cbi_fw_config_db() == DB_1A_HDMI) { + if (db == DB_1A_HDMI || db == DB_LTE_HDMI || db == DB_1A_HDMI_LTE) { /* Select HDMI option */ gpio_set_level(GPIO_HDMI_SEL_L, 0); } else { @@ -526,9 +528,11 @@ __override uint8_t board_get_usb_pd_port_count(void) { enum fw_config_db db = get_cbi_fw_config_db(); - if (db == DB_1A_HDMI || db == DB_NONE) + if (db == DB_1A_HDMI || db == DB_NONE || db == DB_LTE_HDMI + || db == DB_1A_HDMI_LTE) return CONFIG_USB_PD_PORT_MAX_COUNT - 1; - else if (db == DB_1C || db == DB_1C_LTE) + else if (db == DB_1C || db == DB_1C_LTE || db == DB_1C_1A + || db == DB_1C_1A_LTE) return CONFIG_USB_PD_PORT_MAX_COUNT; ccprints("Unhandled DB configuration: %d", db); @@ -539,9 +543,11 @@ __override uint8_t board_get_charger_chip_count(void) { enum fw_config_db db = get_cbi_fw_config_db(); - if (db == DB_1A_HDMI || db == DB_NONE) + if (db == DB_1A_HDMI || db == DB_NONE || db == DB_LTE_HDMI + || db == DB_1A_HDMI_LTE) return CHARGER_NUM - 1; - else if (db == DB_1C || db == DB_1C_LTE) + else if (db == DB_1C || db == DB_1C_LTE || db == DB_1C_1A + || db == DB_1C_1A_LTE) return CHARGER_NUM; ccprints("Unhandled DB configuration: %d", db); |