diff options
| author | Zick Wei <zick.wei@quanta.corp-partner.google.com> | 2020-08-24 17:05:41 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-29 06:07:01 +0000 |
| commit | 772c04f0398fb68d252a5e03170cbcaa1183574d (patch) | |
| tree | ee5761aeeb5461085056ac343a6a958d65b1647f | |
| parent | d2e31415cad8af96dae829ae161db7d6e435d952 (diff) | |
| download | chrome-ec-772c04f0398fb68d252a5e03170cbcaa1183574d.tar.gz | |
morphius: update GPIO for mst function
This patch update GPIO for MST function by board version.
BUG=b:159051013
BRANCH=zork
TEST=verify that MST function can work on board version 4.
Signed-off-by: Zick Wei <zick.wei@quanta.corp-partner.google.com>
Change-Id: I20c672155f0bd29e27e9b28a1e9f3abd03e87add
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2372162
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | board/morphius/board.c | 8 | ||||
| -rw-r--r-- | board/morphius/gpio.inc | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/board/morphius/board.c b/board/morphius/board.c index 3fc99830a9..55474c950f 100644 --- a/board/morphius/board.c +++ b/board/morphius/board.c @@ -291,9 +291,11 @@ enum gpio_signal board_usbc_port_to_hpd_gpio(int port) * this will be removed when version_2 hardware is retired. */ else if (ec_config_has_mst_hub_rtd2141b()) - return (board_ver >= 3) - ? IOEX_USB_C1_HPD_IN_DB - : GPIO_EC_DP1_HPD; + return (board_ver >= 4) + ? GPIO_USB_C1_HPD_IN_DB_V1 + : (board_ver == 3) + ? IOEX_USB_C1_HPD_IN_DB + : GPIO_EC_DP1_HPD; /* USB-C1 OPT1 DB uses DP2_HPD. */ return GPIO_DP2_HPD; diff --git a/board/morphius/gpio.inc b/board/morphius/gpio.inc index a42c5179e1..4cc12a423f 100644 --- a/board/morphius/gpio.inc +++ b/board/morphius/gpio.inc @@ -56,6 +56,7 @@ GPIO(EC_PS2_RESET_V0, PIN(3, 2), GPIO_OUT_LOW) /* Trackpoint reset pin V0*/ GPIO(EC_PS2_RESET_V1, PIN(4, 5), GPIO_OUT_LOW) /* Trackpoint reset pin V1 */ GPIO(EC_H1_PACKET_MODE, PIN(8, 6), GPIO_OUT_LOW) /* H1 Packet Mode */ GPIO(FAN_ID, PIN(8, 2), GPIO_INPUT) /* Fan ID*/ +GPIO(USB_C1_HPD_IN_DB_V1, PIN(B, 1), GPIO_OUT_LOW) /* C1 HPD V1 */ UNIMPLEMENTED(NO_HPD) |