summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@chromium.org>2018-12-17 03:49:19 +0000
committerPhilip Chen <philipchen@chromium.org>2018-12-17 22:04:55 +0000
commit5b27eb1ae048f0fbfeb152c2b9bd1f1da2015ef7 (patch)
tree56d6e6730bf09c0213fed406f2dc0cb547e68355
parentf57c609176a308ba928391571d5c1de7c87deccf (diff)
downloadchrome-ec-5b27eb1ae048f0fbfeb152c2b9bd1f1da2015ef7.tar.gz
Reland "scarlet: Limit the maximal acceptable VBUS to 5.5V"
This reverts commit b86950f867d97834f9e800e835921d57d391f883. Reason for revert: b:78792296 Original change's description: > Revert "scarlet: Limit the maximal acceptable VBUS to 5.5V" > > This reverts commit c4e728e6f991537b5e0f715c4f9e946b029d5bd8. > > BUG=b:78792296 > BRANCH=scarlet > TEST=none > > Change-Id: I4dc73e85cc7883ef4b2ab83da4d671a7709d9fd3 > Signed-off-by: Philip Chen <philipchen@google.com> > Reviewed-on: https://chromium-review.googlesource.com/1034105 > Reviewed-by: Brian Norris <briannorris@chromium.org> > Commit-Queue: Philip Chen <philipchen@chromium.org> > Tested-by: Philip Chen <philipchen@chromium.org> > Trybot-Ready: Philip Chen <philipchen@chromium.org> Bug: b:78792296 Change-Id: I848fbb1027916b265e5d6531c33404a163c1364e Reviewed-on: https://chromium-review.googlesource.com/c/1379731 Reviewed-by: Philip Chen <philipchen@chromium.org> Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Trybot-Ready: Philip Chen <philipchen@chromium.org>
-rw-r--r--board/scarlet/board.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 08840e6c3a..c3cb5cd293 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -144,7 +144,7 @@
#define PD_OPERATING_POWER_MW 15000
#define PD_MAX_POWER_MW ((PD_MAX_VOLTAGE_MV * PD_MAX_CURRENT_MA) / 1000)
#define PD_MAX_CURRENT_MA 3000
-#define PD_MAX_VOLTAGE_MV 9500
+#define PD_MAX_VOLTAGE_MV 5500
#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */
#define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* us */