zephyr: Add the volteer USB-C port controllers

Bring the RT1715 and PS8815 drivers into the build. Move the Kconfig
options next to the exusting TUSB422.

BUG=b:175434113
BRANCH=none
TEST=make BOARD=volteer -j30
build volteer on zephyr

Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: I64cc7d1960f2c6bfd1335785ea3d0627f60d1f8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2617042
Reviewed-by: Keith Short <keithshort@chromium.org>

3 files changed, 45 insertions, 13 deletions

diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 5d48a59610..6b9ed58669 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -136,6 +136,10 @@ zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC
 zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_PRL_SM
                                                 "${PLATFORM_EC}/common/usbc/usb_prl_sm.c")
 
+zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815
+                                                "${PLATFORM_EC}/driver/tcpm/ps8xxx.c")
+zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715
+                                                "${PLATFORM_EC}/driver/tcpm/rt1715.c")
 zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422
                                                 "${PLATFORM_EC}/driver/tcpm/tusb422.c")
 zephyr_sources_ifdef(CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI
diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc
index 28216962fd..61303b04d8 100644
--- a/zephyr/Kconfig.usbc
+++ b/zephyr/Kconfig.usbc
@@ -372,17 +372,6 @@ config PLATFORM_EC_USBC_PPC_SYV682X
 	  features. It provides protection against overcurrent, overvoltage,
 	  thermal shutdown, and undervoltage conditions.
 
-config PLATFORM_EC_USB_PD_TCPM_TUSB422
-	bool "TI TUSB422 Port Control with USB PD"
-	help
-	  This is a a USB PD PHY that enables a USB Type-C port with the
-	  Configuration Channel (CC) logic needed for USB Type-C ecosystems. It
-	  integrates the physical layer of the USB BMC power delivery (PD)
-	  protocol to allow up to 100-W of power and support for alternate mode
-	  interfaces. An external microprocessor, containing USB Type-C Port
-	  Manager (TCPM), communicates with the TUSB422 through an I2C
-	  interface.
-
 choice "Type-C Port Manager (TCPM)"
 	prompt "Choose a Type-C Port Manager (TCPM) to manage TCPC"
 
@@ -407,9 +396,7 @@ config PLATFORM_EC_USB_PD_TCPM_TCPCI
 #  CONFIG_USB_PD_TCPM_ANX7688
 #  CONFIG_USB_PD_TCPM_NCT38XX
 #  CONFIG_USB_PD_TCPM_MT6370
-#  CONFIG_USB_PD_TCPM_TUSB422
 #  CONFIG_USB_PD_TCPM_RAA489000
-#  CONFIG_USB_PD_TCPM_RT1715
 #  CONFIG_USB_PD_TCPM_FUSB307
 #  CONFIG_USB_PD_TCPM_STM32GX
 
@@ -482,6 +469,36 @@ config PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG
 	  factory. Without this, multiple EC images would need to be installed
 	  depending on the board.
 
+config PLATFORM_EC_USB_PD_TCPM_PS8815
+	bool "Parade PS8815 USB-C Gen 2 Type-C Port Controller"
+	help
+	  The Parade Technologies PS8815 is an active retiming/redriving
+	  (respectively for USB 3.1 Gen 2 / DisplayPort 1.4a HBR3) integrated
+	  with a USB Type-C Port Controller (TCPC) for USB Type-C Host and
+	  DisplayPort applications. It supports Power Delivery and the
+	  DisplayPort Alt Mode.
+
+config PLATFORM_EC_USB_PD_TCPM_RT1715
+	bool "Ricktek RT1715 Type-C Port Controller"
+	help
+	  The RT1715 is a USB Type-C controller, integrating a complete Type-C
+	  Transceiver including the Rp and Rd resistors. It does the USB Type-C
+	  detection including attach and orientation. The RT1715 integrates the
+	  physical layer of the USB BMC power delivery protocol to allow up to
+	  100W of power and role swap. The BMC PD block enables full support
+	  for alternative interfaces of the Type-C specification.
+
+config PLATFORM_EC_USB_PD_TCPM_TUSB422
+	bool "TI TUSB422 Port Control with USB PD"
+	help
+	  This is a a USB PD PHY that enables a USB Type-C port with the
+	  Configuration Channel (CC) logic needed for USB Type-C ecosystems. It
+	  integrates the physical layer of the USB BMC power delivery (PD)
+	  protocol to allow up to 100-W of power and support for alternate mode
+	  interfaces. An external microprocessor, containing USB Type-C Port
+	  Manager (TCPM), communicates with the TUSB422 through an I2C
+	  interface.
+
 config PLATFORM_EC_CMD_TCPC_DUMP
 	bool "Console command: tcpc_dump"
 	# anx7447 also supports this command, but is not yet enabled
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index e735ebfb55..a6e6854ed0 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -386,6 +386,17 @@ enum battery_type {
 #define CONFIG_USB_DRP_ACC_TRYSRC
 #endif
 
+#undef CONFIG_USB_PD_TCPM_PS8815
+#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815
+#define CONFIG_USB_PD_TCPM_PS8815
+#define CONFIG_USB_PD_TCPM_PS8815_FORCE_DID
+#endif
+
+#undef CONFIG_USB_PD_TCPM_RT1715
+#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715
+#define CONFIG_USB_PD_TCPM_RT1715
+#endif
+
 #undef CONFIG_USB_PD_TCPM_TUSB422
 #ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422
 #define CONFIG_USB_PD_TCPM_TUSB422