From 936ababb8c1bf35472fc058c1f2d314a35a1476c Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Tue, 23 Jun 2020 16:46:51 +0800 Subject: berknip: remove mst/hdmi hpd function This CL remove mst/hdmi hpd function for schematic change. BUG=b:152841287 BRANCH=none TEST=make buildall Signed-off-by: Zick Wei Change-Id: Ifffd43ca682e5bdec103f87b52ed38934640fc15 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2260092 Reviewed-by: Edward Hill Commit-Queue: Edward Hill --- board/berknip/board.c | 54 -------------------------------------------------- board/berknip/gpio.inc | 3 +-- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/board/berknip/board.c b/board/berknip/board.c index f47be3a11e..227ef3b38c 100644 --- a/board/berknip/board.c +++ b/board/berknip/board.c @@ -285,12 +285,6 @@ void setup_fw_config(void) gpio_enable_interrupt(GPIO_6AXIS_INT_L); 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); @@ -439,54 +433,6 @@ static void setup_fans(void) } DECLARE_HOOK(HOOK_INIT, setup_fans, 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)); -} - #ifdef CONFIG_KEYBOARD_FACTORY_TEST /* * Map keyboard connector pins to EC GPIO pins for factory test. diff --git a/board/berknip/gpio.inc b/board/berknip/gpio.inc index b82c984c78..4ab8379559 100644 --- a/board/berknip/gpio.inc +++ b/board/berknip/gpio.inc @@ -60,8 +60,7 @@ GPIO(C1_CHARGE_LED_AMBER_DB_L, PIN(6, 7), 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 */ -- cgit v1.2.1