diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2021-01-13 16:20:55 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-22 05:00:48 +0000 |
| commit | c5caae72ddbf106660bb82b463b5027d1ad0e880 (patch) | |
| tree | 18b5865a3c2d87e1d292465c289f78cc8d8c3561 | |
| parent | 326814921dd1f93991cb5b49eba9cc9240f4770a (diff) | |
| download | chrome-ec-c5caae72ddbf106660bb82b463b5027d1ad0e880.tar.gz | |
config: Make VCONN Swap delay a documented option
Replace PD_VCONN_SWAP_DELAY with CONFIG_USBC_VCONN_SWAP_DELAY_US. This
is the approximate result of the following command, run from
platform/ec:
find . -type f -\( -name '*.c' -o -name '*.h' -\) | \
xargs sed -iE 's/PD_VCONN_SWAP_DELAY/CONFIG_USBC_VCONN_SWAP_DELAY/g'
Fix some latent formatting errors in usb_pd_protocol.c, because they
were preventing pre-upload hooks from passing.
BUG=b:144165680
TEST=make buildall
BRANCH=none
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: Icaf3b309c08fdcd162e960cf5dc88185016b5d2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2628131
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
66 files changed, 95 insertions, 85 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 63ff61ac16..18b4e956c4 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -195,7 +195,7 @@ /* TODO(b:147314141): Verify these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #ifndef __ASSEMBLER__ diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index ac5fa720bf..526b973e79 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -119,7 +119,7 @@ /* TODO(b/111281797): Use correct PD delay values */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* TODO(b/111281797): Use correct PD power values */ #define PD_OPERATING_POWER_MW 15000 diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index ecb1063706..72bfbbe991 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -142,7 +142,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define PD_OPERATING_POWER_MW 15000 #define PD_MAX_POWER_MW 45000 diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index 07345765d7..a2b3536842 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -157,7 +157,7 @@ /* TODO(b/176988382): Tune values for guybrush */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define PD_OPERATING_POWER_MW 15000 #define PD_MAX_POWER_MW 65000 diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index 24cc045893..3cf794dd81 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -169,7 +169,7 @@ /* TODO(b/122273953): Use correct PD delay values */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* TODO(b/122273953): Use correct PD power values */ #define PD_OPERATING_POWER_MW 15000 diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h index c8e59c42a7..94e4815053 100644 --- a/baseboard/honeybuns/baseboard.h +++ b/baseboard/honeybuns/baseboard.h @@ -83,7 +83,7 @@ /* TODO(b:147314141): Verify these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* BC 1.2 */ diff --git a/baseboard/intelrvp/ite_ec.h b/baseboard/intelrvp/ite_ec.h index 4c98354a62..b6e2790826 100644 --- a/baseboard/intelrvp/ite_ec.h +++ b/baseboard/intelrvp/ite_ec.h @@ -21,6 +21,6 @@ #ifdef CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP /* delay to turn on/off vconn */ - #define PD_VCONN_SWAP_DELAY 5000 /* us */ + #define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #endif #endif /* __CROS_EC_ITE_EC_H */ diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h index 97b91d886f..0097789c5f 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -228,7 +228,7 @@ enum OEM_ID { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Board specific handlers */ void board_reset_pd_mcu(void); diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index 9c5f2d730b..ea15cc1652 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -49,7 +49,7 @@ /* TCPC MT6370 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * The Maximum input voltage is 13.5V, need another 5% tolerance. @@ -67,7 +67,7 @@ /* TCPC FUSB302 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 160000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* b/2230219: 15V has better charging performance than 20V */ #define PD_MAX_VOLTAGE_MV 15000 diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 261c494752..0f626bfba6 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -222,7 +222,7 @@ /* TODO(b/76218141): Use correct PD delay values */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* TODO(b/76218141): Use correct PD power values */ #define PD_OPERATING_POWER_MW 15000 diff --git a/baseboard/trogdor/baseboard.h b/baseboard/trogdor/baseboard.h index 185d84f281..bf36a97a04 100644 --- a/baseboard/trogdor/baseboard.h +++ b/baseboard/trogdor/baseboard.h @@ -142,7 +142,7 @@ /* PD */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define PD_OPERATING_POWER_MW 10000 #define PD_MAX_POWER_MW ((PD_MAX_VOLTAGE_MV * PD_MAX_CURRENT_MA) / 1000) diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 9482ee02be..9cd1a2f5d0 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -212,7 +212,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define PD_OPERATING_POWER_MW 15000 #define PD_MAX_POWER_MW 65000 diff --git a/board/adlrvpp_ite/adlrvp.h b/board/adlrvpp_ite/adlrvp.h index c98bb8e36c..eefc9c5a31 100644 --- a/board/adlrvpp_ite/adlrvp.h +++ b/board/adlrvpp_ite/adlrvp.h @@ -67,7 +67,7 @@ /* Enable VCONN */ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Enabling Thunderbolt-compatible mode */ #define CONFIG_USB_PD_TBT_COMPAT_MODE diff --git a/board/ambassador/board.h b/board/ambassador/board.h index fedcce9d06..0e4c350632 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -109,7 +109,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ -#define PD_VCONN_SWAP_DELAY 8000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON #define PD_MAX_POWER_MW 100000 diff --git a/board/asurada/board.h b/board/asurada/board.h index 7901f14bf1..0852f50cc8 100644 --- a/board/asurada/board.h +++ b/board/asurada/board.h @@ -147,7 +147,7 @@ #define PD_MAX_POWER_MW 60000 #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Optional console commands */ #define CONFIG_CMD_FLASH diff --git a/board/atlas/board.h b/board/atlas/board.h index 0442225d30..499d0e59f6 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -221,7 +221,7 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/boldar/board.h b/board/boldar/board.h index d686e432f9..05a9adcb75 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -76,7 +76,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/cheza/board.h b/board/cheza/board.h index f9fd3bff62..4a2f186a70 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -147,7 +147,7 @@ /* PD */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define PD_OPERATING_POWER_MW 15000 #define PD_MAX_POWER_MW ((PD_MAX_VOLTAGE_MV * PD_MAX_CURRENT_MA) / 1000) diff --git a/board/copano/board.h b/board/copano/board.h index 857719a6d5..0a26124690 100644 --- a/board/copano/board.h +++ b/board/copano/board.h @@ -61,7 +61,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/coral/board.h b/board/coral/board.h index c88ee4e701..3d63c521ec 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -287,7 +287,7 @@ enum coral_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/delbin/board.h b/board/delbin/board.h index 540aab0da7..608ef4234f 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -65,7 +65,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/dooly/board.h b/board/dooly/board.h index 2c6859b9bd..5294ccfa90 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -133,7 +133,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ -#define PD_VCONN_SWAP_DELAY 8000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON #define PD_MAX_POWER_MW 100000 diff --git a/board/drobit/board.h b/board/drobit/board.h index 7b2f9a7ec1..80b1394e5e 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -50,7 +50,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/eldrid/board.h b/board/eldrid/board.h index 669be5c000..8e0f727392 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -69,7 +69,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/elemi/board.h b/board/elemi/board.h index fc49358694..df2423c24d 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -44,7 +44,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/elm/board.h b/board/elm/board.h index 91da1be3f7..035468b0c7 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -230,7 +230,7 @@ enum sensor_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/eve/board.h b/board/eve/board.h index bfb1159cb8..494b56c9c0 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -296,7 +296,7 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/fizz/board.h b/board/fizz/board.h index e3d0120fe5..39fa450c3d 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -246,7 +246,7 @@ enum OEM_ID { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power. Since Fizz doesn't have a battery to charge, * we're not interested in any power lower than the AP power-on threshold. */ diff --git a/board/flapjack/board.h b/board/flapjack/board.h index f918e2e1d9..0f94547b16 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -180,7 +180,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Timer selection */ #define TIM_CLOCK32 2 diff --git a/board/fusb307bgevb/board.h b/board/fusb307bgevb/board.h index d93b34c980..677ff0cf0b 100644 --- a/board/fusb307bgevb/board.h +++ b/board/fusb307bgevb/board.h @@ -52,7 +52,7 @@ #define CONFIG_USB_PD_TCPM_FUSB307 /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define operating power and max power */ #define PD_OPERATING_POWER_MW 15000 #define PD_MAX_VOLTAGE_MV 20000 diff --git a/board/halvor/board.h b/board/halvor/board.h index 850ffd7f43..853727c1ee 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -46,7 +46,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/it8xxx2_pdevb/board.h b/board/it8xxx2_pdevb/board.h index c598b79e15..e7291bf519 100644 --- a/board/it8xxx2_pdevb/board.h +++ b/board/it8xxx2_pdevb/board.h @@ -96,7 +96,7 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ void board_pd_vbus_ctrl(int port, int enabled); diff --git a/board/lindar/board.h b/board/lindar/board.h index 58c816ef3b..7386a98988 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -49,7 +49,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/lingcod/board.h b/board/lingcod/board.h index 00fb342c8a..1fc551cc3c 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -49,7 +49,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/malefor/board.h b/board/malefor/board.h index 0d8200bd05..12f7422c3a 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -49,7 +49,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index f4789e5b81..aa92dc9add 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -457,7 +457,7 @@ enum als_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/nami/board.h b/board/nami/board.h index fe1877dfb6..4211918514 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -307,7 +307,7 @@ enum model_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/nautilus/board.h b/board/nautilus/board.h index e226556dea..7fb353c254 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -229,7 +229,7 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 9dda2b6bcb..cc772c79d4 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -166,7 +166,7 @@ #define PD_MAX_CURRENT_MA 3000 #define PD_MAX_POWER_MW 45000 #define PD_OPERATING_POWER_MW 15000 -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* TODO(aaboagye): Verify these timings. */ /* diff --git a/board/oak/board.h b/board/oak/board.h index 56d3e1ad8e..918aef59d7 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -237,7 +237,7 @@ enum als_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/pdeval-stm32f072/board.h b/board/pdeval-stm32f072/board.h index 19556c8432..90760a8f8c 100644 --- a/board/pdeval-stm32f072/board.h +++ b/board/pdeval-stm32f072/board.h @@ -58,7 +58,7 @@ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* USB Configuration */ #define CONFIG_USB diff --git a/board/poppy/board.h b/board/poppy/board.h index efd4fdd720..7bf2801e1e 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -244,7 +244,7 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/puff/board.h b/board/puff/board.h index 1efd7a40f9..05df884202 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -109,7 +109,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ -#define PD_VCONN_SWAP_DELAY 8000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON #define PD_MAX_POWER_MW 100000 diff --git a/board/rainier/board.h b/board/rainier/board.h index 592c6bca9c..c8ac8c94aa 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -112,7 +112,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Timer selection */ #define TIM_CLOCK32 2 diff --git a/board/rammus/board.h b/board/rammus/board.h index 89ec43c255..c7037a3b85 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -259,7 +259,7 @@ enum pwm_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/reef/board.h b/board/reef/board.h index a22bce3d70..8a35d95e4e 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -290,7 +290,7 @@ enum reef_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index 487592b7e8..03c600b63b 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -203,7 +203,7 @@ enum reef_it8320_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index ef3356bb9d..0584a0ca17 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -296,7 +296,7 @@ enum reef_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h index 8304ae284d..0d73410b54 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -135,7 +135,7 @@ enum pwm_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Define typical operating power and max power */ #define PD_OPERATING_POWER_MW 15000 diff --git a/board/sasuke/board.h b/board/sasuke/board.h index 34ca54800d..2a69fcfe17 100644 --- a/board/sasuke/board.h +++ b/board/sasuke/board.h @@ -82,11 +82,11 @@ #undef PD_POWER_SUPPLY_TURN_ON_DELAY #undef PD_POWER_SUPPLY_TURN_OFF_DELAY -#undef PD_VCONN_SWAP_DELAY +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US /* 20% margin added for these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 13080 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 16080 /* us */ -#define PD_VCONN_SWAP_DELAY 787 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 787 /* us */ /* USB Type A Features */ #define USB_PORT_COUNT 1 diff --git a/board/scarlet/board.h b/board/scarlet/board.h index 9d129a3910..0eb60366de 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -147,7 +147,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* Timer selection */ #define TIM_CLOCK32 2 diff --git a/board/terrador/board.h b/board/terrador/board.h index 16b1af04b7..730ccb4672 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -58,7 +58,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/todor/board.h b/board/todor/board.h index d73130cd07..eb51c05724 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -58,7 +58,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/trondo/board.h b/board/trondo/board.h index 5808e07016..b619cfb02a 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -51,7 +51,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/voema/board.h b/board/voema/board.h index 34e4c7fe1d..e1c916c5e1 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -60,7 +60,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/volteer/board.h b/board/volteer/board.h index 5f13c98a98..364cd75e5d 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -73,8 +73,7 @@ /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ - +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C * cables only support up to 60W. diff --git a/board/voxel/board.h b/board/voxel/board.h index 83a3c8e211..a5f5cdd65a 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -77,7 +77,7 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C diff --git a/board/waddledoo/board.h b/board/waddledoo/board.h index aa87fcf571..acee694928 100644 --- a/board/waddledoo/board.h +++ b/board/waddledoo/board.h @@ -82,11 +82,11 @@ #undef PD_POWER_SUPPLY_TURN_ON_DELAY #undef PD_POWER_SUPPLY_TURN_OFF_DELAY -#undef PD_VCONN_SWAP_DELAY +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US /* 20% margin added for these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 13080 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 16080 /* us */ -#define PD_VCONN_SWAP_DELAY 787 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 787 /* us */ /* I2C configuration */ diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 2460902330..43db22664b 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -4446,12 +4446,14 @@ void pd_task(void *u) /* Turn VCONN on and wait for it */ set_vconn(port, 1); set_state_timeout(port, - get_time().val + PD_VCONN_SWAP_DELAY, - PD_STATE_VCONN_SWAP_READY); + get_time().val + + CONFIG_USBC_VCONN_SWAP_DELAY_US, + PD_STATE_VCONN_SWAP_READY); } else { set_state_timeout(port, - get_time().val + PD_T_VCONN_SOURCE_ON, - READY_RETURN_STATE(port)); + get_time().val + + PD_T_VCONN_SOURCE_ON, + READY_RETURN_STATE(port)); } } break; @@ -4460,9 +4462,9 @@ void pd_task(void *u) if (!(pd[port].flags & PD_FLAGS_VCONN_ON)) { /* VCONN is now on, send PS_RDY */ pd_set_vconn_role(port, - PD_ROLE_VCONN_ON); + PD_ROLE_VCONN_ON); res = send_control(port, - PD_CTRL_PS_RDY); + PD_CTRL_PS_RDY); if (res == -1) { timeout = 10*MSEC; /* @@ -4470,19 +4472,20 @@ void pd_task(void *u) * send soft reset */ set_state(port, - PD_STATE_SOFT_RESET); + PD_STATE_SOFT_RESET); break; } set_state(port, - READY_RETURN_STATE(port)); + READY_RETURN_STATE(port)); } else { /* Turn VCONN off and wait for it */ set_vconn(port, 0); pd_set_vconn_role(port, - PD_ROLE_VCONN_OFF); + PD_ROLE_VCONN_OFF); set_state_timeout(port, - get_time().val + PD_VCONN_SWAP_DELAY, - READY_RETURN_STATE(port)); + get_time().val + + CONFIG_USBC_VCONN_SWAP_DELAY_US, + READY_RETURN_STATE(port)); } } break; diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index 128a5027da..cdf90056d5 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -6221,7 +6221,8 @@ static void pe_vcs_turn_on_vconn_swap_run(int port) if (pe[port].timeout == 0 && PE_CHK_FLAG(port, PE_FLAGS_VCONN_SWAP_COMPLETE)) { PE_CLR_FLAG(port, PE_FLAGS_VCONN_SWAP_COMPLETE); - pe[port].timeout = get_time().val + PD_VCONN_SWAP_DELAY; + pe[port].timeout = + get_time().val + CONFIG_USBC_VCONN_SWAP_DELAY_US; } if (pe[port].timeout > 0 && get_time().val > pe[port].timeout) @@ -6246,7 +6247,8 @@ static void pe_vcs_turn_off_vconn_swap_run(int port) if (pe[port].timeout == 0 && PE_CHK_FLAG(port, PE_FLAGS_VCONN_SWAP_COMPLETE)) { PE_CLR_FLAG(port, PE_FLAGS_VCONN_SWAP_COMPLETE); - pe[port].timeout = get_time().val + PD_VCONN_SWAP_DELAY; + pe[port].timeout = + get_time().val + CONFIG_USBC_VCONN_SWAP_DELAY_US; } if (pe[port].timeout > 0 && get_time().val > pe[port].timeout) { diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c index c618c00fe8..2128625731 100644 --- a/driver/tcpm/it83xx.c +++ b/driver/tcpm/it83xx.c @@ -36,8 +36,8 @@ #endif /* Wait time for vconn power switch to turn off. */ -#ifdef PD_VCONN_SWAP_DELAY -#define PD_IT83XX_VCONN_TURN_OFF_DELAY_US PD_VCONN_SWAP_DELAY +#ifdef CONFIG_USBC_VCONN_SWAP_DELAY_US +#define PD_IT83XX_VCONN_TURN_OFF_DELAY_US CONFIG_USBC_VCONN_SWAP_DELAY_US #else #define PD_IT83XX_VCONN_TURN_OFF_DELAY_US 500 #endif diff --git a/driver/tcpm/it8xxx2.c b/driver/tcpm/it8xxx2.c index 88dadc4285..9e18ad8241 100644 --- a/driver/tcpm/it8xxx2.c +++ b/driver/tcpm/it8xxx2.c @@ -37,8 +37,8 @@ #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) /* Wait time for vconn power switch to turn off. */ -#ifdef PD_VCONN_SWAP_DELAY -#define PD_IT83XX_VCONN_TURN_OFF_DELAY_US PD_VCONN_SWAP_DELAY +#ifdef CONFIG_USBC_VCONN_SWAP_DELAY_US +#define PD_IT83XX_VCONN_TURN_OFF_DELAY_US CONFIG_USBC_VCONN_SWAP_DELAY_US #else #define PD_IT83XX_VCONN_TURN_OFF_DELAY_US 500 #endif diff --git a/fuzz/fuzz_config.h b/fuzz/fuzz_config.h index ae0534d8ba..0569a21b38 100644 --- a/fuzz/fuzz_config.h +++ b/fuzz/fuzz_config.h @@ -57,7 +57,7 @@ #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#define PD_VCONN_SWAP_DELAY 5000 +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 #define CONFIG_SHA256 #define CONFIG_SW_CRC #define CONFIG_USB_PD_3A_PORTS 0 /* Host does not define a 3.0 A PDO */ @@ -78,7 +78,7 @@ #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#define PD_VCONN_SWAP_DELAY 5000 +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 #define CONFIG_SHA256 #define CONFIG_SW_CRC #define CONFIG_USB_PD_3A_PORTS 0 /* Host does not define a 3.0 A PDO */ diff --git a/include/config.h b/include/config.h index 23bda41665..521c29a05b 100644 --- a/include/config.h +++ b/include/config.h @@ -4482,6 +4482,12 @@ /* Support VCONN swap */ #undef CONFIG_USBC_VCONN_SWAP +/* + * The amount of time in microseconds that the board takes to turn VCONN on or + * off after being directed to do so. Typically a property of the PPC. + */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US + /* USB Binary device Object Store support */ #undef CONFIG_USB_BOS diff --git a/test/test_config.h b/test/test_config.h index c240021501..b277592e88 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -389,7 +389,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USB_PD_DECODE_SOP #undef CONFIG_USB_TYPEC_SM #define CONFIG_USBC_VCONN -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define CONFIG_USB_PD_DISCHARGE_GPIO #undef CONFIG_USB_PD_HOST_CMD #define CONFIG_USB_PD_ALT_MODE_DFP @@ -413,7 +413,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USB_PD_DECODE_SOP #undef CONFIG_USB_TYPEC_SM #define CONFIG_USBC_VCONN -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define CONFIG_USB_PD_DISCHARGE_GPIO #undef CONFIG_USB_PD_HOST_CMD #define CONFIG_USB_PD_ALT_MODE_DFP @@ -491,7 +491,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP #define CONFIG_USB_PID 0x5036 -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 268529915a..e4a5d1619f 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -238,7 +238,7 @@ enum battery_type { /* TODO: b/144165680 - measure and check these values on Volteer */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #endif #undef CONFIG_CMD_PPC_DUMP |