diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-08-18 21:20:18 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-22 07:38:06 +0000 |
| commit | 8e6889a2a8f3aeb4907783753f6a8a3db06fb005 (patch) | |
| tree | efeb223d825a8435686f0d7511a59bbc22390395 | |
| parent | 6f5d0b68cb549eaa2d92d02fae60e9b46457ef60 (diff) | |
| download | chrome-ec-8e6889a2a8f3aeb4907783753f6a8a3db06fb005.tar.gz | |
Trembyle: Fix HDMI retimer suspend / resume
BUG=none
BRANCH=none
TEST=none
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: Id997c71498d4cb7f59b87f641cf4a67ec3617bad
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2364117
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | board/trembyle/board.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/board/trembyle/board.c b/board/trembyle/board.c index 5a8f36e0fe..e01f426dc6 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -14,6 +14,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/retimer/pi3dpx1207.h" +#include "driver/retimer/pi3hdx1204.h" #include "driver/retimer/ps8811.h" #include "driver/temp_sensor/sb_tsi.h" #include "driver/usb_mux/amd_fp5.h" @@ -184,12 +185,11 @@ const int usb_port_enable[USBA_PORT_COUNT] = { }; /***************************************************************************** - * USB-A Retimer tuning + * Board suspend / resume */ #define PS8811_ACCESS_RETRIES 2 -/* PS8811 gain tuning */ -static void ps8811_tuning_init(void) +static void board_chipset_resume(void) { int rv; int retry; @@ -210,7 +210,7 @@ static void ps8811_tuning_init(void) } if (rv) { ioex_set_level(IOEX_USB_A0_RETIMER_EN, 0); - CPRINTSUSB("C0: PS8811 not detected"); + CPRINTSUSB("A0: PS8811 not detected"); } /* USB-A1 needs to increase gain to get over MB/DB connector */ @@ -225,18 +225,29 @@ static void ps8811_tuning_init(void) } if (rv) { ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0); - CPRINTSUSB("C1: PS8811 not detected"); + CPRINTSUSB("A1: PS8811 not detected"); + } + + if (ec_config_has_hdmi_retimer_pi3hdx1204()) { + pi3hdx1204_enable(I2C_PORT_TCPC1, + PI3HDX1204_I2C_ADDR_FLAGS, + 1); } } -DECLARE_HOOK(HOOK_CHIPSET_RESUME, ps8811_tuning_init, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); -static void ps8811_retimer_off(void) +static void board_chipset_suspend(void) { - /* Turn on the retimers */ ioex_set_level(IOEX_USB_A0_RETIMER_EN, 0); ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0); + + if (ec_config_has_hdmi_retimer_pi3hdx1204()) { + pi3hdx1204_enable(I2C_PORT_TCPC1, + PI3HDX1204_I2C_ADDR_FLAGS, + 0); + } } -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, ps8811_retimer_off, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); /***************************************************************************** * USB-C MUX/Retimer dynamic configuration |