diff options
| author | Sue Chen <sue.chen@quanta.corp-partner.google.com> | 2020-07-16 14:25:05 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-18 01:36:12 +0000 |
| commit | a3c994ccc1cda5450d8da2c568653ca10b7b8439 (patch) | |
| tree | 556043185b87a46e78316b5790b04a49980a46d8 /board/ezkinil/board.c | |
| parent | a5a82418126ee6cadff69d9487c43edc1ccea097 (diff) | |
| download | chrome-ec-a3c994ccc1cda5450d8da2c568653ca10b7b8439.tar.gz | |
Ezkinil: Compatible with v2 board
For some gpio changed on v3, we should use board_ver to check
which pin is supported on the board.
board_ver=2 board_ver=3
ioex c1 pin(1, 0) gpio pin(7, 5)
HDMI_CONN_HPD_3V3_DB DP1_HPD_EC_IN
Both are interrupt pin to detect HDMI insertion.
BUG=b:159188404
BRANCH=none
TEST=HDMI do work on both v2 and v3 board.
Change-Id: Ibe4da36b8399250b3ee688220509bec3f2daed13
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2301553
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'board/ezkinil/board.c')
| -rw-r--r-- | board/ezkinil/board.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c index 3a3507c1eb..df593667bb 100644 --- a/board/ezkinil/board.c +++ b/board/ezkinil/board.c @@ -7,6 +7,7 @@ #include "adc_chip.h" #include "button.h" #include "charge_state_v2.h" +#include "cros_board_info.h" #include "driver/accelgyro_bmi_common.h" #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" @@ -35,6 +36,8 @@ #ifdef HAS_TASK_MOTIONSENSE +static int board_ver; + /* Motion sensors */ static struct mutex g_lid_mutex; static struct mutex g_base_mutex; @@ -339,20 +342,45 @@ const struct usb_mux usbc1_ps8743 = { void setup_fw_config(void) { + int rv; + + rv = cbi_get_board_version(&board_ver); + if (rv) { + ccprints("Fail to get board_ver"); + /* Default for v3 */ + board_ver = 3; + } + /* Enable Gyro interrupts */ gpio_enable_interrupt(GPIO_6AXIS_INT_L); setup_mux(); - if (ec_config_has_hdmi_conn_hpd()) - gpio_enable_interrupt(GPIO_DP1_HPD_EC_IN); + if (ec_config_has_hdmi_conn_hpd()) { + if (board_ver < 3) + ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); + else + gpio_enable_interrupt(GPIO_DP1_HPD_EC_IN); + } } DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); +__override int check_hdmi_hpd_status(void) +{ + int hpd = 0; + + if (board_ver < 3) + ioex_get_level(IOEX_HDMI_CONN_HPD_3V3_DB, &hpd); + else + hpd = gpio_get_level(GPIO_DP1_HPD_EC_IN); + + return hpd; +} + static void hdmi_hpd_handler(void) { /* Pass HPD through from DB OPT1 HDMI connector to AP's DP1. */ - int hpd = gpio_get_level(GPIO_DP1_HPD_EC_IN); + int hpd = check_hdmi_hpd_status(); gpio_set_level(GPIO_DP1_HPD, hpd); ccprints("HDMI HPD %d", hpd); @@ -366,9 +394,10 @@ void hdmi_hpd_interrupt(enum gpio_signal signal) hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); } -__override int check_hdmi_hpd_status(void) +void hdmi_hpd_interrupt_v2(enum ioex_signal signal) { - return gpio_get_level(GPIO_DP1_HPD_EC_IN); + /* Debounce for 2 msec. */ + hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); } /***************************************************************************** |