zephyr: usb: set a bunch of USBC options automatically

Change most of the USBC options with an associated compatible string to
enable automatically when the corresponding device is defined in the
devicetree.

Most of these don't use the actual struct device yet and only enable a
corresponding ECOS option, and few boards have not been ported to have
the whole usb-c configuration in the devicetree, so some option is a
"default y if ..." rather than a "depends on" so that that can still be
enabled without the device tree node. That can be fixed in the future as
all the boards are ported.

This disables an option for: hoglin, villager, zoglin, zombie due to a
missing dt device (CONFIG_PLATFORM_EC_USBC_PPC_SN5S330) which was
otherwise enabled for all variations.

BRANCH=none
BUG=none
TEST=cq dry run
TEST=zmake compare-builds -a # catches the one above

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ifd543965c2867b35954f48a3fb7afa5289b6e940
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4054626
Reviewed-by: Yuval Peress <peress@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

27 files changed, 33 insertions, 59 deletions

diff --git a/zephyr/Kconfig.ppc b/zephyr/Kconfig.ppc
index 06f78dcf01..a6d376159c 100644
--- a/zephyr/Kconfig.ppc
+++ b/zephyr/Kconfig.ppc
@@ -52,6 +52,8 @@ config PLATFORM_EC_USBC_PPC_VCONN
 
 config PLATFORM_EC_USBC_PPC_AOZ1380
 	bool "Alpha & Omega USB Type-C PD Sink and Source Protection Switch"
+	default y
+	depends on DT_HAS_AOZ_AOZ1380_ENABLED
 	select PLATFORM_EC_USBC_OCP
 	help
 	  AOZ1380DI integrates two power switches and control circuitry to
@@ -65,6 +67,8 @@ config PLATFORM_EC_USBC_PPC_RT1718S
 	select PLATFORM_EC_USBC_PPC_POLARITY
 	select PLATFORM_EC_USBC_PPC_SBU
 	select PLATFORM_EC_USBC_PPC_VCONN if PLATFORM_EC_USBC_VCONN
+	default y
+	depends on DT_HAS_RICHTEK_RT1718S_TCPC_ENABLED
 	help
 	  RT1718S integrates several high voltage protection switch of
 	  SBU1/SBU2/DP/DM from high voltage VBUS touching the adjacent pins. The
@@ -84,6 +88,8 @@ config PLATFORM_EC_USBC_PPC_KTU1125
 
 config PLATFORM_EC_USBC_PPC_NX20P3483
 	bool "NX20P3483 High Voltage Sink/Source Combo Switch"
+	default y
+	depends on DT_HAS_NXP_NX20P348X_ENABLED
 	select PLATFORM_EC_USBC_OCP
 	help
 	  The NX20P3483 is a product with combined multiple power switches
@@ -98,6 +104,8 @@ config PLATFORM_EC_USBC_NX20P348X_RCP_5VSRC_MASK_ENABLE
 
 config PLATFORM_EC_USBC_PPC_RT1739
 	bool "Richtek RT1739 Type-C Power Path Controller"
+	default y
+	depends on DT_HAS_RICHTEK_RT1739_PPC_ENABLED
 	help
 	  RT1739 is a highly integrated USB-C Bi-Directional Power Mux and
 	  Protection IC which includes IEC-61000-4-2 ESD protection cell for
@@ -109,6 +117,7 @@ config PLATFORM_EC_USBC_PPC_SN5S330
 	select PLATFORM_EC_USBC_PPC_POLARITY
 	select PLATFORM_EC_USBC_PPC_SBU
 	select PLATFORM_EC_USBC_PPC_VCONN if PLATFORM_EC_USBC_VCONN
+	default y if DT_HAS_TI_SN5S330_ENABLED || DT_HAS_CROS_SN5S330_EMUL_ENABLED
 	help
 	  This is a USB Type-C Power Delivery 3.0 Bidirectional Power Mux with
 	  CC and SBU short-to-VBUS Protection and Integrated Dead Battery
@@ -122,6 +131,7 @@ config PLATFORM_EC_USBC_PPC_SYV682X
 	select PLATFORM_EC_USBC_OCP
 	select PLATFORM_EC_USBC_PPC_POLARITY
 	select PLATFORM_EC_USBC_PPC_VCONN if PLATFORM_EC_USBC_VCONN
+	default y if DT_HAS_SILERGY_SYV682X_ENABLED
 	help
 	  The SYV682A is a 2 to 1 power mux switch for USB PD applications. The
 	  SYV682A supports dead battery wake up function and Fast Role Swap
diff --git a/zephyr/Kconfig.retimer b/zephyr/Kconfig.retimer
index 3a052f1f1a..1927a349b8 100644
--- a/zephyr/Kconfig.retimer
+++ b/zephyr/Kconfig.retimer
@@ -86,6 +86,8 @@ config PLATFORM_EC_USBC_RETIMER_ANX7451
 
 config PLATFORM_EC_USBC_RETIMER_ANX7483
 	bool "Support Analogix ANX7483 10G Active Retimer"
+	default y
+	depends on DT_HAS_ANALOGIX_ANX7483_ENABLED
 	help
 	  ANX7483 is a 4x4 re-driver capable of switching DisplayPort and
 	  USB3.2 Gen 2 10Gbps signals to support type-C (USB-C) ports with
@@ -101,6 +103,8 @@ config PLATFORM_EC_USBC_RETIMER_PS8811
 
 config PLATFORM_EC_USBC_RETIMER_PS8818
 	bool "Parade PS8818 USB Type-C Retimer for USB and DP Alternate Mode"
+	default y
+	depends on DT_HAS_PARADE_PS8818_ENABLED
 	help
 	  PS8818 is a 10Gbps retimer for Type-C applications with the
 	  integrated USB3.1 and DisplayPort alternate mode port.
diff --git a/zephyr/Kconfig.tcpm b/zephyr/Kconfig.tcpm
index 6e090c8575..d2783e9f0a 100644
--- a/zephyr/Kconfig.tcpm
+++ b/zephyr/Kconfig.tcpm
@@ -34,6 +34,8 @@ if PLATFORM_EC_USB_PD_TCPM_TCPCI
 
 config PLATFORM_EC_USB_PD_TCPM_CCGXXF
 	bool "Cypress CCGXXF Single/Dual USB-C Port Controller with Source PPC"
+	default y
+	depends on DT_HAS_CYPRESS_CCGXXF_ENABLED
 	help
 	  CCGXXF are Single/Dual port USB Type-C controllers that comply with
 	  the USB Type-C and PD specifications. These devices include an
@@ -73,6 +75,7 @@ config PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG
 config PLATFORM_EC_USB_PD_TCPM_ANX7447
 	bool "Analogix ANX7447 USB-C Gen 2 Type-C Port Controller"
 	select PLATFORM_EC_USB_PD_TCPM_MUX
+	default y if DT_HAS_ANALOGIX_ANX7447_TCPC_ENABLED
 	help
 	  The Analogix ANX7447 is a USB Type-C Port Controller (TCPC)
 	  for USB Type-C v1.2 Host, USB3.1 Gen2 and DisplayPort applications.
@@ -106,6 +109,8 @@ endif # PLATFORM_EC_USB_PD_TCPM_ANX7447
 
 config PLATFORM_EC_USB_PD_TCPM_FUSB302
 	bool "Fairchild's FUSB302 Type-C port controller with USB PD"
+	default y
+	depends on DT_HAS_FAIRCHILD_FUSB302_ENABLED
 	help
 	  This is a USB Type-C port controller which enables the USB Type-C
 	  detection including attach, and orientation. It integrates the
@@ -115,6 +120,8 @@ config PLATFORM_EC_USB_PD_TCPM_FUSB302
 
 config PLATFORM_EC_USB_PD_TCPM_NCT38XX
 	bool "Nuvoton 3807/8 Single/Dual Port Controller with Power Delivery"
+	default y
+	depends on DT_HAS_NUVOTON_NCT38XX_ENABLED
 	help
 	  The NCT38n7/8 is a single/dual-port, USB Type-C Port Controller
 	  (TCPC). It incorporates a Power Delivery (PD) PHY with BMC encoding,
@@ -241,6 +248,8 @@ config PLATFORM_EC_USB_PD_TCPM_RT1715
 
 config PLATFORM_EC_USB_PD_TCPM_RT1718S
 	bool "Richtek RT1718S Type-C Port Controller"
+        default y
+        depends on DT_HAS_RICHTEK_RT1718S_TCPC_ENABLED
 	help
 	  The RT1718S is an integrated USB Type-C TCPC controller which
 	  includes IEC-61000-4-2 ESD protection cell for CC/SBU/DP/DM.
diff --git a/zephyr/Kconfig.usb_mux b/zephyr/Kconfig.usb_mux
index 376a28f9b2..d014b85dd0 100644
--- a/zephyr/Kconfig.usb_mux
+++ b/zephyr/Kconfig.usb_mux
@@ -38,12 +38,16 @@ config PLATFORM_EC_USB_MUX_AP_CONTROL
 
 config PLATFORM_EC_USB_MUX_AMD_FP6
 	bool "AMD FP6 integrated mux"
+	default y
+	depends on DT_HAS_AMD_USBC_MUX_AMD_FP6_ENABLED
 	help
 	  Integrated AMD FP6 mux for USB and DP.  Mux control happens over
 	  an i2c channel.
 
 config PLATFORM_EC_USB_MUX_IT5205
 	bool "ITE IT5205 USB Type-C 3:2 Alternative mode passive mux"
+	default y
+	depends on DT_HAS_ITE_IT5205_ENABLED
 	help
 	  This is a USB Type-C 3:2 Alternative mode mux, supporting USB 3.1
 	  Gen 2 10Gbps as well as DisplayPort (DP1.4) at 8Gbps. It provides a
@@ -52,6 +56,8 @@ config PLATFORM_EC_USB_MUX_IT5205
 
 config PLATFORM_EC_USB_MUX_PS8743
 	bool "Parade PS8743 USB-C Host Switch with redriver"
+	default y
+	depends on DT_HAS_PARADE_PS8743_ENABLED
 	help
 	  This is a Parade USB 3.1 Gen 1 / DisplayPort (DP) Alt Mode
 	  High-Bit-Rate 2 (HBR2) redriver. It provides control of switching
diff --git a/zephyr/Kconfig.usbc_ss_mux b/zephyr/Kconfig.usbc_ss_mux
index 5d09bb3b02..a5832a2375 100644
--- a/zephyr/Kconfig.usbc_ss_mux
+++ b/zephyr/Kconfig.usbc_ss_mux
@@ -37,6 +37,8 @@ config PLATFORM_EC_USBC_SS_MUX_DFP_ONLY
 
 config PLATFORM_EC_USB_MUX_VIRTUAL
 	bool "USB Mux is virtual"
+	default y
+	depends on DT_HAS_CROS_EC_USBC_MUX_VIRTUAL_ENABLED
 	depends on PLATFORM_EC_USBC_SS_MUX
 	help
 	  Enable this if a virtual USB mux is supported on the EC, which is
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 402db74994..6a92c29116 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -114,11 +114,8 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
 CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10
 CONFIG_PLATFORM_EC_CHARGE_RAMP_SW=y
 CONFIG_PLATFORM_EC_USB_PID=0x504F
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
-CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB=y
 CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=n
 CONFIG_PLATFORM_EC_USB_MUX_TASK=y
 CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL=y
@@ -135,7 +132,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715=n
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=n
-CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
 CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
diff --git a/zephyr/program/corsola/ite_program.conf b/zephyr/program/corsola/ite_program.conf
index 0c2a19670b..f8b01470d1 100644
--- a/zephyr/program/corsola/ite_program.conf
+++ b/zephyr/program/corsola/ite_program.conf
@@ -57,12 +57,8 @@ CONFIG_TASK_PD_STACK_SIZE=1280
 
 # USB-C
 CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n
-CONFIG_PLATFORM_EC_USBC_PPC_RT1739=y
 CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
-CONFIG_PLATFORM_EC_USB_MUX_IT5205=y
 CONFIG_PLATFORM_EC_USB_MUX_TUSB546=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
diff --git a/zephyr/program/corsola/magikarp/project.conf b/zephyr/program/corsola/magikarp/project.conf
index 2fd94d6fbe..70e21933b3 100644
--- a/zephyr/program/corsola/magikarp/project.conf
+++ b/zephyr/program/corsola/magikarp/project.conf
@@ -7,7 +7,6 @@ CONFIG_BOARD_MAGIKARP=y
 
 # USB-C
 CONFIG_PLATFORM_EC_USB_MUX_TUSB546=n
-CONFIG_PLATFORM_EC_USB_MUX_PS8743=y
 CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=45000
 
 # Keyboard
diff --git a/zephyr/program/corsola/npcx_program.conf b/zephyr/program/corsola/npcx_program.conf
index 300cbe085d..82b542fc23 100644
--- a/zephyr/program/corsola/npcx_program.conf
+++ b/zephyr/program/corsola/npcx_program.conf
@@ -57,18 +57,12 @@ CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n
 CONFIG_PLATFORM_EC_PD_POWER_SUPPLY_TURN_OFF_DELAY=15000
 CONFIG_PLATFORM_EC_PD_POWER_SUPPLY_TURN_ON_DELAY=15000
 CONFIG_PLATFORM_EC_USBC_PPC=y
-CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
-CONFIG_PLATFORM_EC_USBC_PPC_RT1718S=y
-CONFIG_PLATFORM_EC_USB_MUX_PS8743=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_FRS_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
 CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL=y
 CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL=2
-CONFIG_PLATFORM_EC_USB_PD_TCPM_ANX7447=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_ANX7447_AUX_PU_PD=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1718S=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_SBU=y
 CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_BY_BOARD=y
diff --git a/zephyr/program/corsola/tentacruel/project.conf b/zephyr/program/corsola/tentacruel/project.conf
index cbc2210085..594a0f477a 100644
--- a/zephyr/program/corsola/tentacruel/project.conf
+++ b/zephyr/program/corsola/tentacruel/project.conf
@@ -7,7 +7,6 @@ CONFIG_BOARD_TENTACRUEL=y
 
 # USB-C
 CONFIG_PLATFORM_EC_USB_MUX_TUSB546=n
-CONFIG_PLATFORM_EC_USB_MUX_PS8743=y
 
 # Keyboard
 CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3=y
diff --git a/zephyr/program/geralt/program.conf b/zephyr/program/geralt/program.conf
index 952bf11035..1569496f43 100644
--- a/zephyr/program/geralt/program.conf
+++ b/zephyr/program/geralt/program.conf
@@ -148,12 +148,8 @@ CONFIG_TASK_PD_STACK_SIZE=1280
 
 # USB-C
 CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n
-CONFIG_PLATFORM_EC_USBC_PPC_RT1739=y
 CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
-CONFIG_PLATFORM_EC_USB_MUX_PS8743=y
 CONFIG_PLATFORM_EC_USB_MUX_TUSB546=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf
index f4687f2d84..d2f2051534 100644
--- a/zephyr/program/herobrine/program.conf
+++ b/zephyr/program/herobrine/program.conf
@@ -77,9 +77,7 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 # USB-C
 CONFIG_PLATFORM_EC_USB_PD_FRS=y
 CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
 CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
 CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE=n
 CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y
diff --git a/zephyr/program/intelrvp/adlrvp/prj.conf b/zephyr/program/intelrvp/adlrvp/prj.conf
index df0811ecdd..3273146d53 100644
--- a/zephyr/program/intelrvp/adlrvp/prj.conf
+++ b/zephyr/program/intelrvp/adlrvp/prj.conf
@@ -44,13 +44,11 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n
 CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG=n
 CONFIG_PLATFORM_EC_USB_MUX_TUSB1044=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_REV30=y
 CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=y
 CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=y
 CONFIG_PLATFORM_EC_USB_PD_USB4=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_FUSB302=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
 CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_PPC=y
diff --git a/zephyr/program/intelrvp/mtlrvp/prj.conf b/zephyr/program/intelrvp/mtlrvp/prj.conf
index 1270712f99..8faed84a56 100644
--- a/zephyr/program/intelrvp/mtlrvp/prj.conf
+++ b/zephyr/program/intelrvp/mtlrvp/prj.conf
@@ -40,7 +40,6 @@ CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
 
 # USB CONFIG
 CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_MUX_TASK=y
 CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
 CONFIG_PLATFORM_EC_USBC_PPC=y
@@ -51,8 +50,6 @@ CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_CCGXXF=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
 CONFIG_PLATFORM_EC_USB_PD_TRY_SRC=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_SBU=y
diff --git a/zephyr/program/nissa/npcx_program.conf b/zephyr/program/nissa/npcx_program.conf
index 83ee245a8d..54b70d35a3 100644
--- a/zephyr/program/nissa/npcx_program.conf
+++ b/zephyr/program/nissa/npcx_program.conf
@@ -25,8 +25,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
 CONFIG_PLATFORM_EC_USB_PD_TCPC_LPM_EXIT_DEBOUNCE_US=100000
 # RAA489000 uses TCPCI but not a separate PPC, so custom function is required
 CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
-# type C port 1 redriver
-CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
 
 # Save some flash space by turning off features we don't care much about
 # (EC Kconfig.console turns the ones we do care about on by default)
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index 31e45d9c8d..ff2e7c47a7 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -96,7 +96,6 @@ CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=n
 CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY=n
 
 CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 # ADL integrated muxes are slow: unblock PD
 CONFIG_PLATFORM_EC_USB_MUX_TASK=y
 
diff --git a/zephyr/program/rex/program.conf b/zephyr/program/rex/program.conf
index 58ea528b76..9cf28cdcfa 100644
--- a/zephyr/program/rex/program.conf
+++ b/zephyr/program/rex/program.conf
@@ -79,8 +79,6 @@ CONFIG_PLATFORM_EC_CHARGER_MIN_INPUT_CURRENT_LIMIT=512
 
 # USBC
 CONFIG_PLATFORM_EC_USBC_PPC=y
-CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
 CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y
 CONFIG_PLATFORM_EC_USBC_PPC_SYV682X_SMART_DISCHARGE=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_HB=y
@@ -94,7 +92,6 @@ CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_REV30=y
 CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815=y
 CONFIG_PLATFORM_EC_USB_PD_TRY_SRC=y
 CONFIG_PLATFORM_EC_USB_PD_DUAL_ROLE_AUTO_TOGGLE=y
@@ -105,7 +102,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
 CONFIG_PLATFORM_EC_USB_PID=0x504D
 
 #USB Mux
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_MUX_TASK=y
 
 # External power
diff --git a/zephyr/program/skyrim/crystaldrift/project.conf b/zephyr/program/skyrim/crystaldrift/project.conf
index 2fc0da7178..18f57a7671 100644
--- a/zephyr/program/skyrim/crystaldrift/project.conf
+++ b/zephyr/program/skyrim/crystaldrift/project.conf
@@ -13,8 +13,6 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000
 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000
 CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
 
-CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
-
 # Enable alternative charger chip
 CONFIG_PLATFORM_EC_CHARGER_RUNTIME_CONFIG=y
 CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y
diff --git a/zephyr/program/skyrim/morthal/project.conf b/zephyr/program/skyrim/morthal/project.conf
index 6a43615134..31fcb0691a 100644
--- a/zephyr/program/skyrim/morthal/project.conf
+++ b/zephyr/program/skyrim/morthal/project.conf
@@ -14,7 +14,5 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000
 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000
 CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
 
-CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
-
 # Battery
 CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y
diff --git a/zephyr/program/skyrim/program.conf b/zephyr/program/skyrim/program.conf
index 6d0d5a5574..dc8c604569 100644
--- a/zephyr/program/skyrim/program.conf
+++ b/zephyr/program/skyrim/program.conf
@@ -83,13 +83,9 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20
 CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=50000
 
 # USB-C
-CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
-CONFIG_PLATFORM_EC_USBC_PPC_AOZ1380=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7451=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_PS8811=y
-CONFIG_PLATFORM_EC_USBC_RETIMER_PS8818=y
 CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y
-CONFIG_PLATFORM_EC_USB_MUX_AMD_FP6=y
 CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y
 CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
 CONFIG_PLATFORM_EC_USB_PID=0x505F
@@ -103,7 +99,6 @@ CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
 CONFIG_PLATFORM_EC_USB_PD_REV30=y
 CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=n
 CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
-CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n
 CONFIG_PLATFORM_EC_USB_PD_USB4=n
 CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
diff --git a/zephyr/program/skyrim/skyrim/project.conf b/zephyr/program/skyrim/skyrim/project.conf
index 7d26a9949c..b03b459006 100644
--- a/zephyr/program/skyrim/skyrim/project.conf
+++ b/zephyr/program/skyrim/skyrim/project.conf
@@ -13,8 +13,6 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000
 CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000
 CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
 
-CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
-
 # Enable alternative charger chip
 CONFIG_PLATFORM_EC_CHARGER_RUNTIME_CONFIG=y
 CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y
diff --git a/zephyr/program/skyrim/winterhold/project.conf b/zephyr/program/skyrim/winterhold/project.conf
index b2b4aa14e3..4daff2805b 100644
--- a/zephyr/program/skyrim/winterhold/project.conf
+++ b/zephyr/program/skyrim/winterhold/project.conf
@@ -9,8 +9,6 @@ CONFIG_BOARD_WINTERHOLD=y
 CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y
 CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y
 
-CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
-
 # Enable charger chip
 CONFIG_PLATFORM_EC_CHARGER_ISL9238=y
 CONFIG_PLATFORM_EC_CHARGER_ISL9241=n
diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf
index a4e606c179..64e7ca48ae 100644
--- a/zephyr/program/trogdor/lazor/prj.conf
+++ b/zephyr/program/trogdor/lazor/prj.conf
@@ -80,7 +80,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 
 # USB-C
 CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
 CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE=n
 CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y
 CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 167994a11c..0e930e13e6 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -82,8 +82,6 @@ CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y
 CONFIG_PLATFORM_EC_HOSTCMD=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=y
 CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
 CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
 CONFIG_PLATFORM_EC_SWITCH=y
 CONFIG_PLATFORM_EC_SWITCHCAP_LN9310=y
diff --git a/zephyr/test/krabby/prj.conf b/zephyr/test/krabby/prj.conf
index 2f2a03923b..06e36261e9 100644
--- a/zephyr/test/krabby/prj.conf
+++ b/zephyr/test/krabby/prj.conf
@@ -28,7 +28,6 @@ CONFIG_PLATFORM_EC_USBC=y
 CONFIG_PLATFORM_EC_USB_CHARGER=y
 CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
 CONFIG_PLATFORM_EC_USB_MUX_TUSB546=y
-CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
 CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_ADC_EACH_PORT=y
@@ -36,4 +35,3 @@ CONFIG_PLATFORM_EC_USB_POWER_DELIVERY=y
 CONFIG_PLATFORM_EC_VBOOT_HASH=n
 
 CONFIG_PLATFORM_EC_USBC_PPC=y
-CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y
diff --git a/zephyr/test/vboot_efs2/prj.conf b/zephyr/test/vboot_efs2/prj.conf
index 0b894dd082..f1d3223dc3 100644
--- a/zephyr/test/vboot_efs2/prj.conf
+++ b/zephyr/test/vboot_efs2/prj.conf
@@ -17,7 +17,6 @@ CONFIG_PLATFORM_EC_CHARGE_RAMP_SW=y
 CONFIG_PLATFORM_EC_HOSTCMD=y
 CONFIG_PLATFORM_EC_SWITCH=n
 CONFIG_PLATFORM_EC_USBC=y
-CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
 CONFIG_PLATFORM_EC_USB_CHARGER=y
 CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=n
 CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
diff --git a/zephyr/test/vboot_efs2/src/main.c b/zephyr/test/vboot_efs2/src/main.c
index 6fb9e8ba02..28981ebc49 100644
--- a/zephyr/test/vboot_efs2/src/main.c
+++ b/zephyr/test/vboot_efs2/src/main.c
@@ -391,14 +391,10 @@ int pd_set_power_supply_ready(int port)
 	return EC_SUCCESS;
 }
 
-enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_COUNT };
+enum usbc_port { USBC_PORT_COUNT };
 
 /* USBC PPC configuration */
 struct ppc_config_t ppc_chips[] = {
-	[USBC_PORT_C0] = {
-		.i2c_port = I2C_PORT_USB_C0,
-		.i2c_addr_flags = SN5S330_ADDR0_FLAGS,
-		.drv = &sn5s330_drv,
-	},
+	/* not needed for the test */
 };
 unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);