summaryrefslogtreecommitdiff
path: root/baseboard
diff options
context:
space:
mode:
authorAbe Levkoy <alevkoy@chromium.org>2021-01-13 16:20:55 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-22 05:00:48 +0000
commitc5caae72ddbf106660bb82b463b5027d1ad0e880 (patch)
tree18b5865a3c2d87e1d292465c289f78cc8d8c3561 /baseboard
parent326814921dd1f93991cb5b49eba9cc9240f4770a (diff)
downloadchrome-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>
Diffstat (limited to 'baseboard')
-rw-r--r--baseboard/dedede/baseboard.h2
-rw-r--r--baseboard/dragonegg/baseboard.h2
-rw-r--r--baseboard/grunt/baseboard.h2
-rw-r--r--baseboard/guybrush/baseboard.h2
-rw-r--r--baseboard/hatch/baseboard.h2
-rw-r--r--baseboard/honeybuns/baseboard.h2
-rw-r--r--baseboard/intelrvp/ite_ec.h2
-rw-r--r--baseboard/kalista/baseboard.h2
-rw-r--r--baseboard/kukui/baseboard.h4
-rw-r--r--baseboard/octopus/baseboard.h2
-rw-r--r--baseboard/trogdor/baseboard.h2
-rw-r--r--baseboard/zork/baseboard.h2
12 files changed, 13 insertions, 13 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
View Lorry Controller Status