Dalboz/Dirinboz: Consolidate retimer power control functions

Add USBA retimer power control to HDMI retimer power control function to
turn retimers off in S3.

BUG=b:162747874
BRANCH=None
TEST=None

Signed-off-by: Josie Nordrum <josienordrum@google.com>
Change-Id: I449322726f9d5d59c9281359ebdbb890c5931f8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2352420
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Tested-by: Edward Hill <ecgh@chromium.org>

2 files changed, 24 insertions, 24 deletions

diff --git a/board/dalboz/board.c b/board/dalboz/board.c
index a6f1af3ef9..025e79badc 100644
--- a/board/dalboz/board.c
+++ b/board/dalboz/board.c
@@ -200,6 +200,9 @@ static void retimers_on(void)
 {
 	/* hdmi retimer power on */
 	ioex_set_level(IOEX_EN_PWR_HDMI_DB, 1);
+
+	/* usba retimer power on */
+	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 1);
 }
 DECLARE_HOOK(HOOK_CHIPSET_RESUME, retimers_on, HOOK_PRIO_DEFAULT);
 
@@ -207,6 +210,9 @@ static void retimers_off(void)
 {
 	/* hdmi retimer power off */
 	ioex_set_level(IOEX_EN_PWR_HDMI_DB, 0);
+
+	/* usba retimer power off */
+	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0);
 }
 DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, retimers_off, HOOK_PRIO_DEFAULT);
 
@@ -628,18 +634,6 @@ int usb_port_enable[USBA_PORT_COUNT] = {
 	IOEX_EN_USB_A1_5V_DB_OPT1,
 };
 
-static void usba_retimer_on(void)
-{
-	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 1);
-}
-DECLARE_HOOK(HOOK_CHIPSET_RESUME, usba_retimer_on, HOOK_PRIO_DEFAULT);
-
-static void usba_retimer_off(void)
-{
-	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0);
-}
-DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, usba_retimer_off, HOOK_PRIO_DEFAULT);
-
 static void check_v0_battery(void)
 {
 	uint32_t board_version = 0;
diff --git a/board/dirinboz/board.c b/board/dirinboz/board.c
index a4e5588178..7517ee2130 100644
--- a/board/dirinboz/board.c
+++ b/board/dirinboz/board.c
@@ -145,6 +145,24 @@ unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
 #endif /* HAS_TASK_MOTIONSENSE */
 
 /*****************************************************************************
+ * Retimers
+ */
+
+static void retimers_on(void)
+{
+	/* usba retimer power on */
+	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 1);
+}
+DECLARE_HOOK(HOOK_CHIPSET_RESUME, retimers_on, HOOK_PRIO_DEFAULT);
+
+static void retimers_off(void)
+{
+	/* usba retimer power off */
+	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0);
+}
+DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, retimers_off, HOOK_PRIO_DEFAULT);
+
+/*****************************************************************************
  * USB-C
  */
 
@@ -502,15 +520,3 @@ int usb_port_enable[USBA_PORT_COUNT] = {
 	IOEX_EN_USB_A0_5V,
 	IOEX_EN_USB_A1_5V_DB,
 };
-
-static void usba_retimer_on(void)
-{
-	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 1);
-}
-DECLARE_HOOK(HOOK_CHIPSET_RESUME, usba_retimer_on, HOOK_PRIO_DEFAULT);
-
-static void usba_retimer_off(void)
-{
-	ioex_set_level(IOEX_USB_A1_RETIMER_EN, 0);
-}
-DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, usba_retimer_off, HOOK_PRIO_DEFAULT);