From 3969b0c1fb8a169ca2cceaf77958c7f1668f1a55 Mon Sep 17 00:00:00 2001 From: Edward Hill Date: Wed, 15 Apr 2020 11:57:53 -0600 Subject: Zork: move PI3DPX1207 config out of baseboard PI3DPX1207 config needs to be board specific. BUG=b:144227077 BRANCH=none TEST=none Signed-off-by: Edward Hill Change-Id: Ib2760f3786dabb5a14baab546d6320792e2d2e3a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2150557 Reviewed-by: Denis Brockus Commit-Queue: Denis Brockus --- baseboard/zork/baseboard.h | 1 - baseboard/zork/variant_trembyle.c | 20 -------------------- 2 files changed, 21 deletions(-) (limited to 'baseboard') diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index e8bf12fdf4..be0040e518 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -163,7 +163,6 @@ #if defined(VARIANT_ZORK_TREMBYLE) #define CONFIG_USB_MUX_RUNTIME_CONFIG - #define CONFIG_USBC_RETIMER_PI3DPX1207 #define CONFIG_USBC_RETIMER_PS8802 #define CONFIG_USBC_RETIMER_PS8818 #define CONFIG_IO_EXPANDER_PORT_COUNT USBC_PORT_COUNT diff --git a/baseboard/zork/variant_trembyle.c b/baseboard/zork/variant_trembyle.c index c58b9bbeee..0d131db677 100644 --- a/baseboard/zork/variant_trembyle.c +++ b/baseboard/zork/variant_trembyle.c @@ -6,7 +6,6 @@ #include "chipset.h" #include "common.h" #include "console.h" -#include "driver/retimer/pi3dpx1207.h" #include "driver/retimer/ps8802.h" #include "driver/retimer/ps8818.h" #include "driver/retimer/tusb544.h" @@ -284,25 +283,6 @@ static int board_ps8818_mux_set(const struct usb_mux *me, return rv; } -const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { - [USBC_PORT_C0] = { -#ifdef VARIANT_ZORK_TREMBYLE - .enable_gpio = IOEX_USB_C0_DATA_EN, - .dp_enable_gpio = GPIO_USB_C0_IN_HPD, -#endif - }, - [USBC_PORT_C1] = { - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pi3dpx1207_controls) == USBC_PORT_COUNT); - -const struct usb_mux usbc0_pi3dpx1207_usb_retimer = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, - .driver = &pi3dpx1207_usb_retimer, -}; - const struct usb_mux usbc1_ps8802 = { .usb_port = USBC_PORT_C1, .i2c_port = I2C_PORT_TCPC1, -- cgit v1.2.1