diff options
| author | Diana Z <dzigterman@chromium.org> | 2022-06-01 14:50:21 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-02 21:52:41 +0000 |
| commit | ee4b708735ec9f4194670aa355d68fe5cda24384 (patch) | |
| tree | 25ba76adbeebaca35c8df98813382f7e3414d3b2 | |
| parent | 75f3cbfebdcfafc06d0ecb2c7ec43da19962ed10 (diff) | |
| download | chrome-ec-ee4b708735ec9f4194670aa355d68fe5cda24384.tar.gz | |
USB mux: Add CONFIG for AP driven mux control
Add a CONFIG option to support the AP directing mux and retimer sets.
BRANCH=None
BUG=b:208882941,b:155889939
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Ic42e256126f68684bbfdd27654f41c0e5290caf9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3687076
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | include/config.h | 3 | ||||
| -rw-r--r-- | zephyr/Kconfig.usb_mux | 7 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index ff4eabc5a6..b19f76f614 100644 --- a/include/config.h +++ b/include/config.h @@ -5302,6 +5302,9 @@ /* Allow run-time completion of the usb mux driver structure */ #undef CONFIG_USB_MUX_RUNTIME_CONFIG +/* Allow the AP to send commands for mux control */ +#undef CONFIG_USB_MUX_AP_CONTROL + /* Support the AMD FP5 USB/DP Mux */ #undef CONFIG_USB_MUX_AMD_FP5 diff --git a/zephyr/Kconfig.usb_mux b/zephyr/Kconfig.usb_mux index db8bcc06d1..e83190c34f 100644 --- a/zephyr/Kconfig.usb_mux +++ b/zephyr/Kconfig.usb_mux @@ -28,6 +28,13 @@ config TASK_USB_MUX_STACK_SIZE help Set the size of the USB mux task stack, in bytes. +config PLATFORM_EC_USB_MUX_AP_CONTROL + bool "AP USB mux control" + depends on PLATFORM_EC_USB_MUX_TASK + help + Allows the AP to send commands in order to control any muxes and + retimers for the board. + config PLATFORM_EC_USB_MUX_AMD_FP6 bool "AMD FP6 integrated mux" help diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index feeb5c2599..a811b68ccc 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1651,6 +1651,11 @@ extern struct jump_data mock_jump_data; #define CONFIG_USBC_SS_MUX_DFP_ONLY #endif +#undef CONFIG_USB_MUX_AP_CONTROL +#ifdef CONFIG_PLATFORM_EC_USB_MUX_AP_CONTROL +#define CONFIG_USB_MUX_AP_CONTROL +#endif + #undef CONFIG_USB_MUX_AMD_FP6 #ifdef CONFIG_PLATFORM_EC_USB_MUX_AMD_FP6 #define CONFIG_USB_MUX_AMD_FP6 |