diff options
author | YH Lin <yueherngl@google.com> | 2022-10-21 19:42:31 +0000 |
---|---|---|
committer | YH Lin <yueherngl@google.com> | 2022-10-21 19:42:31 +0000 |
commit | 1afa995cc54968d86bec8a23bab66bb07742dbdf (patch) | |
tree | 05312290a753b197be054f5f77d49819f2991ecc /zephyr/shim/include/usbc/tusb1064_usb_mux.h | |
parent | 03fdd0082ca2be6b86214b677ac629a558feb722 (diff) | |
parent | fae6145045a7bb060c00de1a1fafe506267159e5 (diff) | |
download | chrome-ec-1afa995cc54968d86bec8a23bab66bb07742dbdf.tar.gz |
Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
Relevant changes:
git log --oneline 03fdd0082c..fae6145045 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh
b65e11f66f crota: sync FW_CONFIG form_factor
0d1b98c718 tree: Enable warning for fallthrough in switch statements
93684a594f crota: configure GPIOD2 as PMU alternate function
2fdea49d04 tcpc: modify nct38xx and fusb302 get vbus voltage function
d0307eb698 board/vell: Fix compilation with clang
BRANCH=None
BUG=b:252974232 b:172020503 b:202062363 b:253644823 b:254402731
BUG=b:254401750
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Signed-off-by: YH Lin <yueherngl@google.com>
Change-Id: I74add4a9f4d30822118607765065857ed9753bb3
Diffstat (limited to 'zephyr/shim/include/usbc/tusb1064_usb_mux.h')
-rw-r--r-- | zephyr/shim/include/usbc/tusb1064_usb_mux.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/zephyr/shim/include/usbc/tusb1064_usb_mux.h b/zephyr/shim/include/usbc/tusb1064_usb_mux.h index 55dc8d4645..4dfdcaff18 100644 --- a/zephyr/shim/include/usbc/tusb1064_usb_mux.h +++ b/zephyr/shim/include/usbc/tusb1064_usb_mux.h @@ -9,6 +9,7 @@ #include "driver/usb_mux/tusb1064.h" #define TUSB1064_USB_MUX_COMPAT ti_tusb1064 +#define TUSB1064_EMUL_COMPAT zephyr_tusb1064_emul #if defined(CONFIG_USB_MUX_TUSB1044) #define USB_MUX_CONFIG_TUSB1064(mux_id) \ |