diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2022-09-23 11:17:28 +1000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-27 03:27:21 +0000 |
| commit | 817f468ae22bef0558ea87a50c582c65db35176b (patch) | |
| tree | 50aeb5a198e183b510daa4d0d4d58cc4222d1a0a | |
| parent | 9244b4365ac3298846630566ac6565796fa98b09 (diff) | |
| download | chrome-ec-817f468ae22bef0558ea87a50c582c65db35176b.tar.gz | |
zephyr/usbc: default-disable TBT mode support
CONFIG_USB_PD_TBT_COMPAT_MODE is default-disabled for EC-OS builds, so
do the same for Zephyr. This makes it much easier to discover which
devices support TBT mode 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 appear to support TBT mode but don't explicitly enable it
are changed to enable it to avoid any undesired configuration change.
BUG=none
TEST=zmake testall
BRANCH=none
Change-Id: Iedc40f5529e6e7f1f9d4605b5364fd76b957934b
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3915747
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 | 1 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/prj.conf | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd index 69e544d8ca..6868fe4fbe 100644 --- a/zephyr/Kconfig.pd +++ b/zephyr/Kconfig.pd @@ -314,7 +314,7 @@ config PLATFORM_EC_USB_PD_USB4 config PLATFORM_EC_USB_PD_TBT_COMPAT_MODE bool "Thunderbolt-compatible mode support" depends on PLATFORM_EC_USB_PD_REV30 - default y + default n help Enable this to allow entering into Thunderbolt-compatible mode between two port partners. This does not require that USB4 mode be enabled. diff --git a/zephyr/Kconfig.retimer b/zephyr/Kconfig.retimer index 9be4d630e7..9ce134dc13 100644 --- a/zephyr/Kconfig.retimer +++ b/zephyr/Kconfig.retimer @@ -7,6 +7,7 @@ if PLATFORM_EC_USBC config PLATFORM_EC_USBC_RETIMER_INTEL_BB bool "Support Intel Burnside Bridge retimer" select PLATFORM_EC_USB_PD_USB4 + select PLATFORM_EC_USB_PD_TBT_COMPAT_MODE help Enable this to support the Intel Burnside Bridge Thunderbolt / USB / DisplayPort retimer. @@ -29,6 +30,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 + select PLATFORM_EC_USB_PD_TBT_COMPAT_MODE 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 3554e05451..422f862809 100644 --- a/zephyr/projects/brya/prj.conf +++ b/zephyr/projects/brya/prj.conf @@ -145,6 +145,7 @@ 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_TBT_COMPAT_MODE=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 diff --git a/zephyr/projects/intelrvp/adlrvp/prj.conf b/zephyr/projects/intelrvp/adlrvp/prj.conf index 9ce1228b03..dbf5b4bb9c 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_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 |