diff options
| author | Tommy Chung <tommy.chung@quanta.corp-partner.google.com> | 2021-05-19 10:52:04 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-26 04:00:00 +0000 |
| commit | f40b9f6a8c1824d8deb65e3f9969c0da0cfaa426 (patch) | |
| tree | e0be1ec3802706a60b110581b950ac277c2de530 /board/haboki | |
| parent | 082d639b629e5f07543f1b6942769518e70a4ea0 (diff) | |
| download | chrome-ec-f40b9f6a8c1824d8deb65e3f9969c0da0cfaa426.tar.gz | |
haboki: Update fw_config_db
Update fw_config_db to meet cbi_fw_config table on haboki.
BUG=b:189154383
BRANCH=none
TEST=on haboki, make sure that all DB configs act correctly.
Signed-off-by: Tommy Chung <tommy.chung@quanta.corp-partner.google.com>
Change-Id: I014afd6939094db12f4abd76483a21567e3aee8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2905035
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Zick Wei <zick.wei@quanta.corp-partner.google.com>
Commit-Queue: Henry Sun <henrysun@google.com>
Diffstat (limited to 'board/haboki')
| -rw-r--r-- | board/haboki/board.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/board/haboki/board.c b/board/haboki/board.c index aa1c0a520f..d70c3788d2 100644 --- a/board/haboki/board.c +++ b/board/haboki/board.c @@ -137,9 +137,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); @@ -371,8 +372,9 @@ unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); 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 { @@ -491,9 +493,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); @@ -504,9 +508,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); |