diff options
| author | Tim Wawrzynczak <twawrzynczak@chromium.org> | 2019-04-18 12:38:09 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-19 14:45:15 -0700 |
| commit | 1ab49b02f6d8662996ab245f3d2add46f10efddf (patch) | |
| tree | 1ff3db08b3be5e5c0075e2d5ff06d2f9ca028b3a | |
| parent | dfe65d9d63179c9260dc89d485df039f517c93af (diff) | |
| download | chrome-ec-1ab49b02f6d8662996ab245f3d2add46f10efddf.tar.gz | |
hatch/kohaku: Move HDMI support to board-specific.
Hatch baseboard contained HDMI support, but Kohaku does not have HDMI
support, so that code is moved to Hatch board specific code instead.
BUG=b:130577280
BRANCH=none
TEST=Kled device still works with HDMI; detects when HDMI is plugged in
and correctly uses the extra display.
Change-Id: Idfcea36068b441c8ad499c1f42f0f0ecf681f978
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1574698
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
| -rw-r--r-- | baseboard/hatch/baseboard.c | 3 | ||||
| -rw-r--r-- | board/hatch/board.c | 2 | ||||
| -rw-r--r-- | board/kohaku/board.c | 5 | ||||
| -rw-r--r-- | board/kohaku/gpio.inc | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index 2bfefda683..737e280eeb 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -181,9 +181,6 @@ void baseboard_tcpc_init(void) gpio_enable_interrupt(GPIO_USB_C0_TCPC_INT_ODL); gpio_enable_interrupt(GPIO_USB_C1_TCPC_INT_ODL); - /* Enable HDMI HPD interrupt. */ - gpio_enable_interrupt(GPIO_HDMI_CONN_HPD); - /* Enable BC 1.2 interrupts */ gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_ODL); gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_ODL); diff --git a/board/hatch/board.c b/board/hatch/board.c index cf3459d220..4149445231 100644 --- a/board/hatch/board.c +++ b/board/hatch/board.c @@ -408,6 +408,8 @@ static void board_init(void) setup_fans(); /* Enable gpio interrupt for base accelgyro sensor */ gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); + /* Enable HDMI HPD interrupt. */ + gpio_enable_interrupt(GPIO_HDMI_CONN_HPD); /* Select correct gpio signal for PP5000_A control */ board_gpio_set_pp5000(); } diff --git a/board/kohaku/board.c b/board/kohaku/board.c index 50d6cb8f1d..70b0471301 100644 --- a/board/kohaku/board.c +++ b/board/kohaku/board.c @@ -76,11 +76,6 @@ static void tcpc_alert_event(enum gpio_signal signal) schedule_deferred_pd_interrupt(port); } -static void hdmi_hpd_interrupt(enum gpio_signal signal) -{ - baseboard_mst_enable_control(MST_HDMI, gpio_get_level(signal)); -} - static void bc12_interrupt(enum gpio_signal signal) { switch (signal) { diff --git a/board/kohaku/gpio.inc b/board/kohaku/gpio.inc index 47028dd2a6..9aa52d7d79 100644 --- a/board/kohaku/gpio.inc +++ b/board/kohaku/gpio.inc @@ -34,8 +34,6 @@ GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 5), GPIO_INT_FALLING, bc12_interrupt) GPIO_INT(USB_C1_BC12_INT_ODL, PIN(E, 4), GPIO_INT_FALLING, bc12_interrupt) -GPIO_INT(HDMI_CONN_HPD, PIN(7, 2), GPIO_INT_BOTH, hdmi_hpd_interrupt) - /* Volume button interrupts */ GPIO_INT(EC_VOLDN_BTN_ODL, PIN(9, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(EC_VOLUP_BTN_ODL, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) |