diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2021-01-13 17:00:32 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-22 05:00:49 +0000 |
| commit | 94dd77896d8729a5456e3fa61c258c9415c0c246 (patch) | |
| tree | eeb474ba920876c77ee9ee6e600adbea1fe9cb16 | |
| parent | c5caae72ddbf106660bb82b463b5027d1ad0e880 (diff) | |
| download | chrome-ec-94dd77896d8729a5456e3fa61c258c9415c0c246.tar.gz | |
config: Provide default VCONN Swap delay
Almost every relevant board copy-pastes 5000 us. Make that the default
and get rid of the redundant definitions. This is the approximate result
of this command:
find . -type f -name *.h | xargs sed -i -E \
'/#define CONFIG_USBC_VCONN_SWAP_DELAY_US[[:space:]]+5000[[:space:]]/d'
BUG=b:144165680
TEST=make buildall
BRANCH=none
Change-Id: Ife86f9752971abcd7ab5ad5a5e607eb2ccbde2ba
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2628132
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
61 files changed, 8 insertions, 60 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 18b4e956c4..96cedeee2a 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -195,7 +195,6 @@ /* 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 CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #ifndef __ASSEMBLER__ diff --git a/baseboard/dragonegg/baseboard.h b/baseboard/dragonegg/baseboard.h index 526b973e79..ef13842bc6 100644 --- a/baseboard/dragonegg/baseboard.h +++ b/baseboard/dragonegg/baseboard.h @@ -119,7 +119,6 @@ /* 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 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 72bfbbe991..2621bcdbdb 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -142,7 +142,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 a2b3536842..f1f0458c06 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -157,7 +157,6 @@ /* 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 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 3cf794dd81..1f4cffad56 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -169,7 +169,6 @@ /* 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 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 94e4815053..addab2a42e 100644 --- a/baseboard/honeybuns/baseboard.h +++ b/baseboard/honeybuns/baseboard.h @@ -83,7 +83,6 @@ /* 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 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 b6e2790826..c773a48b21 100644 --- a/baseboard/intelrvp/ite_ec.h +++ b/baseboard/intelrvp/ite_ec.h @@ -21,6 +21,5 @@ #ifdef CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP /* delay to turn on/off vconn */ - #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 0097789c5f..5cda6c310c 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -228,7 +228,6 @@ enum OEM_ID { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 ea15cc1652..ebcf429d17 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -49,7 +49,6 @@ /* TCPC MT6370 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ /* * The Maximum input voltage is 13.5V, need another 5% tolerance. @@ -67,7 +66,6 @@ /* TCPC FUSB302 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 160000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* 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 0f626bfba6..44868cc475 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -222,7 +222,6 @@ /* 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 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 bf36a97a04..ec459287f1 100644 --- a/baseboard/trogdor/baseboard.h +++ b/baseboard/trogdor/baseboard.h @@ -142,7 +142,6 @@ /* PD */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* 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 9cd1a2f5d0..5bb03b939c 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -212,7 +212,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 eefc9c5a31..b147552d59 100644 --- a/board/adlrvpp_ite/adlrvp.h +++ b/board/adlrvpp_ite/adlrvp.h @@ -67,7 +67,6 @@ /* Enable VCONN */ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -#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 0e4c350632..d44a0ec681 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -109,6 +109,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US #define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON diff --git a/board/asurada/board.h b/board/asurada/board.h index 0852f50cc8..1febb26b24 100644 --- a/board/asurada/board.h +++ b/board/asurada/board.h @@ -147,7 +147,6 @@ #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 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 499d0e59f6..4d0795f8d3 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -221,7 +221,6 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 05a9adcb75..17b0a5e720 100644 --- a/board/boldar/board.h +++ b/board/boldar/board.h @@ -76,7 +76,6 @@ /* 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 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 4a2f186a70..3583bb2c84 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -147,7 +147,6 @@ /* PD */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* 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 0a26124690..f1703109c1 100644 --- a/board/copano/board.h +++ b/board/copano/board.h @@ -61,7 +61,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 3d63c521ec..1fec0ed36c 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -287,7 +287,6 @@ enum coral_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 608ef4234f..1c61a52da5 100644 --- a/board/delbin/board.h +++ b/board/delbin/board.h @@ -65,7 +65,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 5294ccfa90..f3ecac684c 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -133,6 +133,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US #define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON diff --git a/board/drobit/board.h b/board/drobit/board.h index 80b1394e5e..80fd4a83b9 100644 --- a/board/drobit/board.h +++ b/board/drobit/board.h @@ -50,7 +50,6 @@ /* 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 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 8e0f727392..6942504eb4 100644 --- a/board/eldrid/board.h +++ b/board/eldrid/board.h @@ -69,7 +69,6 @@ /* 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 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 df2423c24d..c9be63a60d 100644 --- a/board/elemi/board.h +++ b/board/elemi/board.h @@ -44,7 +44,6 @@ /* 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 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 035468b0c7..37d8854477 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -230,7 +230,6 @@ enum sensor_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 494b56c9c0..f342af8f55 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -296,7 +296,6 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 39fa450c3d..da48944973 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -246,7 +246,6 @@ enum OEM_ID { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 0f94547b16..4d077ad21d 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -180,7 +180,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* 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 677ff0cf0b..3495f7125f 100644 --- a/board/fusb307bgevb/board.h +++ b/board/fusb307bgevb/board.h @@ -52,7 +52,6 @@ #define CONFIG_USB_PD_TCPM_FUSB307 /* delay to turn on/off vconn */ -#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 853727c1ee..da42d0fafe 100644 --- a/board/halvor/board.h +++ b/board/halvor/board.h @@ -46,7 +46,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* 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 e7291bf519..44aa02cd7d 100644 --- a/board/it8xxx2_pdevb/board.h +++ b/board/it8xxx2_pdevb/board.h @@ -96,7 +96,6 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 7386a98988..2dfcbf9061 100644 --- a/board/lindar/board.h +++ b/board/lindar/board.h @@ -49,7 +49,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 1fc551cc3c..0763c849c8 100644 --- a/board/lingcod/board.h +++ b/board/lingcod/board.h @@ -49,7 +49,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 12f7422c3a..93a8733c55 100644 --- a/board/malefor/board.h +++ b/board/malefor/board.h @@ -49,7 +49,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 aa92dc9add..99cc39391f 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -457,7 +457,6 @@ enum als_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 4211918514..300fa495f4 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -307,7 +307,6 @@ enum model_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 7fb353c254..4e79519ee0 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -229,7 +229,6 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 cc772c79d4..cd840629d0 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -166,7 +166,6 @@ #define PD_MAX_CURRENT_MA 3000 #define PD_MAX_POWER_MW 45000 #define PD_OPERATING_POWER_MW 15000 -#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 918aef59d7..9993c06648 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -237,7 +237,6 @@ enum als_id { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 90760a8f8c..e0b364e2c9 100644 --- a/board/pdeval-stm32f072/board.h +++ b/board/pdeval-stm32f072/board.h @@ -58,7 +58,6 @@ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP /* delay to turn on/off vconn */ -#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 7bf2801e1e..607108a8e5 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -244,7 +244,6 @@ enum adc_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 05df884202..10885d8449 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -109,6 +109,7 @@ /* b/143501304 */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 4000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 2000 /* us */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US #define CONFIG_USBC_VCONN_SWAP_DELAY_US 8000 /* us */ #define PD_OPERATING_POWER_MW CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON diff --git a/board/rainier/board.h b/board/rainier/board.h index c8ac8c94aa..20c0de975e 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -112,7 +112,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* 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 c7037a3b85..04a446e672 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -259,7 +259,6 @@ enum pwm_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 8a35d95e4e..ef2957c577 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -290,7 +290,6 @@ enum reef_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 03c600b63b..9bc9d2249a 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -203,7 +203,6 @@ enum reef_it8320_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 0584a0ca17..eb5e4b8a05 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -296,7 +296,6 @@ enum reef_board_version { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 0d73410b54..6f7b78c6f6 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -135,7 +135,6 @@ enum pwm_channel { #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ /* delay to turn on/off vconn */ -#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 2a69fcfe17..b2a79a499c 100644 --- a/board/sasuke/board.h +++ b/board/sasuke/board.h @@ -86,6 +86,7 @@ /* 20% margin added for these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 13080 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 16080 /* us */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US #define CONFIG_USBC_VCONN_SWAP_DELAY_US 787 /* us */ /* USB Type A Features */ diff --git a/board/scarlet/board.h b/board/scarlet/board.h index 0eb60366de..12d4d14c87 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -147,7 +147,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* 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 730ccb4672..0472207936 100644 --- a/board/terrador/board.h +++ b/board/terrador/board.h @@ -58,7 +58,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 eb51c05724..dd63c5c04b 100644 --- a/board/todor/board.h +++ b/board/todor/board.h @@ -58,7 +58,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 b619cfb02a..51d36f1b52 100644 --- a/board/trondo/board.h +++ b/board/trondo/board.h @@ -51,7 +51,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 e1c916c5e1..2f08c2dde1 100644 --- a/board/voema/board.h +++ b/board/voema/board.h @@ -60,7 +60,6 @@ /* 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 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 364cd75e5d..4129143051 100644 --- a/board/volteer/board.h +++ b/board/volteer/board.h @@ -73,7 +73,6 @@ /* 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 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 a5f5cdd65a..b3e0b1d9e3 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -77,7 +77,6 @@ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* 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 acee694928..c286507638 100644 --- a/board/waddledoo/board.h +++ b/board/waddledoo/board.h @@ -86,6 +86,7 @@ /* 20% margin added for these timings */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 13080 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 16080 /* us */ +#undef CONFIG_USBC_VCONN_SWAP_DELAY_US #define CONFIG_USBC_VCONN_SWAP_DELAY_US 787 /* us */ diff --git a/include/config.h b/include/config.h index 521c29a05b..bfcb4070b0 100644 --- a/include/config.h +++ b/include/config.h @@ -4484,9 +4484,10 @@ /* * 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. + * off after being directed to do so. Typically a property of the PPC. Default + * to 5 ms. */ -#undef CONFIG_USBC_VCONN_SWAP_DELAY_US +#define CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* USB Binary device Object Store support */ #undef CONFIG_USB_BOS diff --git a/test/test_config.h b/test/test_config.h index b277592e88..562be47ca9 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -389,7 +389,6 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USB_PD_DECODE_SOP #undef CONFIG_USB_TYPEC_SM #define CONFIG_USBC_VCONN -#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 +412,6 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USB_PD_DECODE_SOP #undef CONFIG_USB_TYPEC_SM #define CONFIG_USBC_VCONN -#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 +489,6 @@ int ncp15wb_calculate_temp(uint16_t adc); #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP #define CONFIG_USB_PID 0x5036 -#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 e4a5d1619f..e335010fa3 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -238,7 +238,6 @@ 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 CONFIG_USBC_VCONN_SWAP_DELAY_US 5000 /* us */ #endif #undef CONFIG_CMD_PPC_DUMP |