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 /baseboard | |
| 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>
Diffstat (limited to 'baseboard')
| -rw-r--r-- | baseboard/dedede/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/dragonegg/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/grunt/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/guybrush/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/hatch/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/honeybuns/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/intelrvp/ite_ec.h | 1 | ||||
| -rw-r--r-- | baseboard/kalista/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/kukui/baseboard.h | 2 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/trogdor/baseboard.h | 1 | ||||
| -rw-r--r-- | baseboard/zork/baseboard.h | 1 |
12 files changed, 0 insertions, 13 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 |