diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2023-04-13 17:59:46 +0800 |
|---|---|---|
| committer | Eric Yilun Lin <yllin@google.com> | 2023-04-13 10:01:21 +0000 |
| commit | 017e8c8b9803e5f421522183ce3c4bad5c5236e5 (patch) | |
| tree | 2b26885b6e0caf5bf54fc5c882044c3f6a5b9630 /zephyr/program/rex/rex/src/usb_mux_config.c | |
| parent | 846964eb47c50aea47ab05af1b2ad7aeed8369ba (diff) | |
| parent | fd4151fe81b041c480db9c265fb24e84aa6ef4dc (diff) | |
| download | chrome-ec-017e8c8b9803e5f421522183ce3c4bad5c5236e5.tar.gz | |
Merge remote-tracking branch cros/main into firmware-corsola-15194.B-mainfirmware-corsola-15194.B-main
Generated by: util/update_release_branch.py -r -z --board corsla --relevant_paths_file
util/corsola-relevant-paths.txt firmware-corsola-15194.B-main
Relevant changes:
git log --oneline 846964eb47..fd4151fe81 -- zephyr/program/corsla
common/charge_state_v2.c common/dps.c common/mkbp_* common/usb_charger.c
common/usb_common.c common/usbc/*_pd_* common/usbc/dp_alt_mode.c
common/usbc/usb_pe_drp_sm.c common/usbc/usb_prl_sm.c
common/usbc/usb_sm.c common/usbc/usb_tc_drp_acc_trysrc_sm.c
driver/battery/smart.c driver/bc12/pi3usb9201.* driver/charger/isl923x.*
driver/charger/rt949* driver/ppc/nx20p348x.* driver/ppc/rt1718s.*
driver/ppc/syv682x.* driver/tcpm/anx7447.* driver/tcpm/rt1718s.*
driver/tcpm/tcpci.* driver/usb_mux/it5205.* driver/usb_mux/ps8743.*
power/mt8186.c zephyr/boards/arm/npcx9/* zephyr/boards/riscv/it8xxx2/*
zephyr/drivers/* zephyr/program/corsola/* zephyr/shim/*
util/getversion.sh
fd4151fe81 zephyr: Kconfig: add FLASH_PSTATE_BANK / FLASH_PSTATE_LOCKED
d18304f138 voltorb: remove debug options and features for FW QUAL
57ed659cb9 USB-PD: Update EC_CMD_TYPEC_STATUS for EPR
d14883b6fd RAA489110: Add RAA489110 driver
e06fe77101 binman: Add binman nodelabel and use it
48cde011ac retimer: Add driver for ANX7452 retimer
BRANCH=None
BUG=none
TEST=`make -j buildall`
Cq-Depend: chromium:4421692
Force-Relevant-Builds: all
Change-Id: I2d7a5d8c6dbfc9d8c13cde3b9e1fcc06ae782067
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Diffstat (limited to 'zephyr/program/rex/rex/src/usb_mux_config.c')
| -rw-r--r-- | zephyr/program/rex/rex/src/usb_mux_config.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/zephyr/program/rex/rex/src/usb_mux_config.c b/zephyr/program/rex/rex/src/usb_mux_config.c index a549235f3c..a3d2d4ab0c 100644 --- a/zephyr/program/rex/rex/src/usb_mux_config.c +++ b/zephyr/program/rex/rex/src/usb_mux_config.c @@ -11,6 +11,8 @@ #include "hooks.h" #include "ioexpander.h" #include "usb_mux.h" +#include "usbc/ppc.h" +#include "usbc/tcpci.h" #include "usbc/usb_muxes.h" #include <zephyr/drivers/gpio.h> @@ -47,5 +49,11 @@ static void setup_mux(void) if (val == FW_USB_DB_USB3) { LOG_INF("USB DB: Setting USB3 mux"); } + if (val == FW_USB_DB_USB4_ANX7452) { + LOG_INF("USB DB: Setting ANX7452 mux"); + USB_MUX_ENABLE_ALTERNATIVE(usb_mux_chain_anx7452_port1); + TCPC_ENABLE_ALTERNATE_BY_NODELABEL(1, rt1716_tcpc_port1); + PPC_ENABLE_ALTERNATE_BY_NODELABEL(1, ppc_port1_syv); + } } DECLARE_HOOK(HOOK_INIT, setup_mux, HOOK_PRIO_INIT_I2C); |