diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-09-23 11:11:48 +1000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-27 01:56:52 +0000 |
| commit | 9244b4365ac3298846630566ac6565796fa98b09 (patch) | |
| tree | 103fcb9a13f247b2b52eafa0d4e6d4e1582c938f | |
| parent | 1cf09c4347925917453618a927aa6d51fd025823 (diff) | |
| download | chrome-ec-9244b4365ac3298846630566ac6565796fa98b09.tar.gz | |
zephyr/usbc: default-disable USB4
CONFIG_USB_PD_USB4 is default-disabled for EC-OS builds, so do the same
for Zephyr. This makes it much easier to discover which devices support
USB4 by requiring positive confirmation of support, rather than relying
on projects to disable it if not supported which may be less likely for
developers to notice.
Projects that do support USB4 (or may support it but it's difficult to
tell either way) now have it enabled explicitly.
BUG=none
TEST=zmake testall
BRANCH=none
Change-Id: Ib281f15cbb2cfbbaf0c5c3dbb2658405bbfbd423
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3915746
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/Kconfig.pd | 2 | ||||
| -rw-r--r-- | zephyr/Kconfig.retimer | 2 | ||||
| -rw-r--r-- | zephyr/projects/brya/prj.conf | 3 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/rex/prj.conf | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd index 926ede198b..69e544d8ca 100644 --- a/zephyr/Kconfig.pd +++ b/zephyr/Kconfig.pd @@ -304,7 +304,7 @@ config PLATFORM_EC_USB_PD_TRY_SRC config PLATFORM_EC_USB_PD_USB4 bool "USB4 support" depends on PLATFORM_EC_USB_PD_REV30 - default y + default n help This enables support for entering into USB4 mode between two port partners. The provides new features such as higher speeds and more diff --git a/zephyr/Kconfig.retimer b/zephyr/Kconfig.retimer index 8a460715cb..9be4d630e7 100644 --- a/zephyr/Kconfig.retimer +++ b/zephyr/Kconfig.retimer @@ -6,6 +6,7 @@ if PLATFORM_EC_USBC config PLATFORM_EC_USBC_RETIMER_INTEL_BB bool "Support Intel Burnside Bridge retimer" + select PLATFORM_EC_USB_PD_USB4 help Enable this to support the Intel Burnside Bridge Thunderbolt / USB / DisplayPort retimer. @@ -27,6 +28,7 @@ config PLATFORM_EC_USBC_RETIMER_INTEL_BB config PLATFORM_EC_USBC_RETIMER_INTEL_HB bool "Support Intel Hayden Bridge retimer" + select PLATFORM_EC_USB_PD_USB4 help Enable this to support the Intel Hayden Bridge Thunderbolt / USB / DisplayPort retimer. diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf index f640197a37..3554e05451 100644 --- a/zephyr/projects/brya/prj.conf +++ b/zephyr/projects/brya/prj.conf @@ -130,7 +130,6 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10 CONFIG_PLATFORM_EC_CHARGE_RAMP_SW=y CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y CONFIG_PLATFORM_EC_USB_PID=0x504F -CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=y CONFIG_PLATFORM_EC_USBC_PPC_SYV682X=y CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB=y @@ -145,6 +144,8 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y CONFIG_PLATFORM_EC_USB_PD_PPC=y CONFIG_PLATFORM_EC_USB_PD_REV30=y +CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=y +CONFIG_PLATFORM_EC_USB_PD_USB4=y 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 diff --git a/zephyr/projects/intelrvp/adlrvp/prj.conf b/zephyr/projects/intelrvp/adlrvp/prj.conf index 1663a08276..9ce1228b03 100644 --- a/zephyr/projects/intelrvp/adlrvp/prj.conf +++ b/zephyr/projects/intelrvp/adlrvp/prj.conf @@ -56,6 +56,7 @@ CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY=y CONFIG_PLATFORM_EC_USB_PD_REV30=y CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=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 diff --git a/zephyr/projects/rex/prj.conf b/zephyr/projects/rex/prj.conf index 62602854f2..9941091921 100644 --- a/zephyr/projects/rex/prj.conf +++ b/zephyr/projects/rex/prj.conf @@ -122,6 +122,7 @@ CONFIG_PLATFORM_EC_USB_PD_TRY_SRC=y CONFIG_PLATFORM_EC_USB_PD_DUAL_ROLE_AUTO_TOGGLE=y CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=y CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=y +CONFIG_PLATFORM_EC_USB_PD_USB4=y CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y CONFIG_PLATFORM_EC_USB_PID=0x504D |