diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2023-02-16 00:14:21 +0000 |
|---|---|---|
| committer | Peter Marheine <pmarheine@chromium.org> | 2023-02-16 00:14:21 +0000 |
| commit | f43d6df6f2860dbe8ec15aebdc28890771ad7897 (patch) | |
| tree | 6877eff7016f9979e46017ea5221a16d36344304 /include/usb_pd.h | |
| parent | dce247e97903a2464ff8884106bffa43587c1dcb (diff) | |
| parent | 0849542c72359150a357945c010dca6b5a213633 (diff) | |
| download | chrome-ec-firmware-nissa-15217.126.B-main.tar.gz | |
Merge remote-tracking branch cros/main into firmware-nissa-15217.B-mainfirmware-nissa-15217.126.B-main
Generated by: ./util/update_release_branch.py --zephyr --board nissa firmware-
nissa-15217.B-main
Relevant changes:
git log --oneline dce247e979..0849542c72 -- zephyr/program/nissa
util/getversion.sh
0849542c72 zephyr: add sleep property for keyboard factory test
5825d894b9 nissa: disable PLATFORM_EC_TCPC_INTERRUPT
25a400690f yavikso: Update fan table version 3
9263f14536 zephyr: remove shi node and add references to shi0
b40c6970d3 Craask: Charger limit for 65w adapter
6fd2d3ea6c zephyr: add comments for tcpc driver
00986ffb1c zephyr: move usbc interrupt handler to shim
2508094b14 yaviks: reduce RW image size (64KB)
55b6aaf52f yaviks: enable keyboard factory test
4786d1eac6 nissa: Add ocpc init function to Nissa boards
2ae1083638 zephyr: cros_kb: set KSI/KSO kbs mode by pinctrl driver
d415f4665a yaviks: Fix OCPC Vsys overshooting
93f9d42a7c zephyr: config: drop few more redundant options
BRANCH=None
BUG=b:254148652 b:260762509 b:265220075 b:268273712 b:265763662
BUG=b:253557900 b:254148652 b:269212593 b:267404783 b:262352202
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I195dd82af114180b611f9afd1465a69f7f43d417
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Diffstat (limited to 'include/usb_pd.h')
| -rw-r--r-- | include/usb_pd.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/usb_pd.h b/include/usb_pd.h index cb31f986c7..ddc632e91c 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -1960,6 +1960,13 @@ void pd_dfp_discovery_init(int port); void pd_dfp_mode_init(int port); /** + * Mark all discovery types as failed to prevent any further discovery attempts + * until a connection change or DPM request triggers discovery again. + * @param port USB-C port number + */ +void pd_disable_discovery(int port); + +/** * Set identity discovery state for this type and port * * @param port USB-C port number @@ -3150,6 +3157,7 @@ __override_proto int board_pd_set_frs_enable(int port, int enable); */ __overridable void board_frs_handler(int port); +#ifdef CONFIG_USB_PD_DP_MODE /** * Get current DisplayPort pin mode on the specified port. * @@ -3157,6 +3165,12 @@ __overridable void board_frs_handler(int port); * @return MODE_DP_PIN_[A-E] if used else 0 */ __override_proto uint8_t get_dp_pin_mode(int port); +#else +static inline uint8_t get_dp_pin_mode(int port) +{ + return 0; +} +#endif /* CONFIG_USB_PD_DP_MODE */ /** * Get board specific usb pd port count |