diff options
| author | Zick Wei <zick.wei@quanta.corp-partner.google.com> | 2020-06-18 17:02:15 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-19 06:37:05 +0000 |
| commit | ce672c614e13810a40b31e8aca9a01ce553cd6af (patch) | |
| tree | 223c48498f0d0de58288c93ba07369945c514b78 | |
| parent | aae3aa1f17dac67bebd20d6f873e88dc6edd1526 (diff) | |
| download | chrome-ec-ce672c614e13810a40b31e8aca9a01ce553cd6af.tar.gz | |
morphius: remove mst/hdmi hpd function
This patch remove mst/hdmi hpd function due to schematic change.
BUG=b:150278507
BRANCH=none
TEST=make buildall
Signed-off-by: Zick Wei <zick.wei@quanta.corp-partner.google.com>
Change-Id: I8e61f850cc8861b20756213460c91f86d0d8bf6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2251702
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | board/morphius/board.c | 54 | ||||
| -rw-r--r-- | board/morphius/gpio.inc | 3 |
2 files changed, 0 insertions, 57 deletions
diff --git a/board/morphius/board.c b/board/morphius/board.c index 3b6130d3bf..1e58fe6672 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -298,12 +298,6 @@ void setup_fw_config(void) ps2_enable_channel(NPCX_PS2_CH0, 1, send_aux_data_to_host); setup_mux(); - - if (ec_config_has_mst_hub_rtd2141b()) - ioex_enable_interrupt(IOEX_MST_HPD_OUT); - - if (ec_config_has_hdmi_conn_hpd()) - ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); } DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); @@ -508,51 +502,3 @@ static void board_chipset_suspend(void) sb_smart_charge_mode(SB_SMART_CHARGE_ENABLE); } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); - -/***************************************************************************** - * MST hub - */ - -static void mst_hpd_handler(void) -{ - int hpd = 0; - - /* - * Ensure level on GPIO_DP1_HPD matches IOEX_MST_HPD_OUT, in case - * we got out of sync. - */ - ioex_get_level(IOEX_MST_HPD_OUT, &hpd); - gpio_set_level(GPIO_DP1_HPD, hpd); - ccprints("MST HPD %d", hpd); -} -DECLARE_DEFERRED(mst_hpd_handler); - -void mst_hpd_interrupt(enum ioex_signal signal) -{ - /* - * Goal is to pass HPD through from DB OPT3 MST hub to AP's DP1. - * Immediately invert GPIO_DP1_HPD, to pass through the edge on - * IOEX_MST_HPD_OUT. Then check level after 2 msec debounce. - */ - int hpd = !gpio_get_level(GPIO_DP1_HPD); - - gpio_set_level(GPIO_DP1_HPD, hpd); - hook_call_deferred(&mst_hpd_handler_data, (2 * MSEC)); -} - -static void hdmi_hpd_handler(void) -{ - int hpd = 0; - - /* Pass HPD through from DB OPT1 HDMI connector to AP's DP1. */ - ioex_get_level(IOEX_HDMI_CONN_HPD_3V3_DB, &hpd); - gpio_set_level(GPIO_DP1_HPD, hpd); - ccprints("HDMI HPD %d", hpd); -} -DECLARE_DEFERRED(hdmi_hpd_handler); - -void hdmi_hpd_interrupt(enum ioex_signal signal) -{ - /* Debounce for 2 msec. */ - hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); -} diff --git a/board/morphius/gpio.inc b/board/morphius/gpio.inc index b8657f6a4d..366bb198ce 100644 --- a/board/morphius/gpio.inc +++ b/board/morphius/gpio.inc @@ -58,9 +58,6 @@ UNIMPLEMENTED(PCH_SMI_L) GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_HIGH) GPIO(LED_CHRG_L, PIN(C, 0), GPIO_OUT_HIGH) -IOEX_INT(HDMI_CONN_HPD_3V3_DB, EXPIN(USBC_PORT_C1, 1, 0), GPIO_INT_BOTH, hdmi_hpd_interrupt) -IOEX_INT(MST_HPD_OUT, EXPIN(USBC_PORT_C1, 0, 3), GPIO_INT_BOTH, mst_hpd_interrupt) - IOEX(USB_A0_RETIMER_EN, EXPIN(USBC_PORT_C0, 0, 0), GPIO_OUT_LOW) /* A0 Retimer Enable */ IOEX(USB_A0_RETIMER_RST, EXPIN(USBC_PORT_C0, 0, 1), GPIO_OUT_LOW) /* A0 Retimer Reset */ IOEX(USB_C0_FAULT_ODL, EXPIN(USBC_PORT_C0, 0, 3), GPIO_ODR_HIGH) /* C0 Fault to SOC */ |