diff options
| author | Rob Barnes <robbarnes@google.com> | 2021-03-11 14:17:09 -0700 |
|---|---|---|
| committer | Rob Barnes <robbarnes@google.com> | 2021-03-12 17:23:11 +0000 |
| commit | 3eeaf9c10014218f84bf5f797eb6f5d78a419f3e (patch) | |
| tree | 309d4378d5c96f7ca7a12c8cc8b79753189d5329 | |
| parent | 0d3506ed79b1765d3dcab5a7fee695b4f08b3b01 (diff) | |
| download | chrome-ec-3eeaf9c10014218f84bf5f797eb6f5d78a419f3e.tar.gz | |
kconfig: Add CONFIG_USB_PD_TCPC_VCONN
Add CONFIG_USB_PD_TCPC_VCONN to Kconfig.usb.
Also add CONFIG_VBOOT_HASH_RELOAD_WATCHDOG to allow list since it's a
temporary config (b/182499153).
BUG=None
TEST=Build
BRANCH=None
Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: Idde220f7d89a719686b3afba83c94b9973deca9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2752431
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | util/config_allowed.txt | 1 | ||||
| -rw-r--r-- | zephyr/Kconfig.usbc | 9 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 38428c4a87..ab470d15d1 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -1323,6 +1323,7 @@ CONFIG_VALUE CONFIG_VBOOT_EFS CONFIG_VBOOT_EFS2 CONFIG_VBOOT_HASH +CONFIG_VBOOT_HASH_RELOAD_WATCHDOG CONFIG_VOLUME_BUTTONS CONFIG_VSTORE CONFIG_VSTORE_SLOT_COUNT diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc index a4eabb0fcf..1a6f94d702 100644 --- a/zephyr/Kconfig.usbc +++ b/zephyr/Kconfig.usbc @@ -735,6 +735,15 @@ config PLATFORM_EC_USB_PD_TCPC_LPM_EXIT_DEBOUNCE_US is the delay in microseconds to allow before checking the CC line status in the EC. +config PLATFORM_EC_USB_PD_TCPC_VCONN + bool "If VCONN is enabled, the TCPC will provide VCONN" + default y if !PLATFORM_EC_USBC_PPC_SYV682X + help + Source USB Type-C connector voltage (VCONN) from the Type-C Port + Controller (TCPC), and also the Power Path Controller (PPC) if + present. Some TCPC/PPC can't handle 5V on its host-side CC pins, so + disable this config in those cases. + choice "Type-C Port Manager (TCPM)" prompt "Choose a Type-C Port Manager (TCPM) to manage TCPC" diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 3a4a4c3535..f5b5645b13 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1231,4 +1231,9 @@ enum battery_type { #define CONFIG_VBOOT_EFS2 #endif +#undef CONFIG_USB_PD_TCPC_VCONN +#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPC_VCONN +#define CONFIG_USB_PD_TCPC_VCONN +#endif + #endif /* __CROS_EC_CONFIG_CHIP_H */ |