diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2018-05-16 20:00:16 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-17 19:34:45 -0700 |
| commit | c2455d4caf3be8248ed5275da6f149ebb0d417e0 (patch) | |
| tree | b293c8a097b1e6863e53350e4e70c098a465e281 | |
| parent | 8c891f0d32954471b7f437d0282eecc0c088c84a (diff) | |
| download | chrome-ec-c2455d4caf3be8248ed5275da6f149ebb0d417e0.tar.gz | |
Revert "cr50: add s3 term for rk3399 devices"
This reverts commit c40bb886e92c76547fdd889ff50ef159b5ea5d67.
Reason for revert: This causes scarlet to boot into recovery
Original change's description:
> cr50: add s3 term for rk3399 devices
>
> BUG=b:62200096
> BRANCH=cr50
> TEST=run suspend/resume tests on bob
>
> Change-Id: Idb249125f5967f6f9c80afbf991998425f9f5005
> Signed-off-by: Mary Ruthven <mruthven@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/991339
> Commit-Ready: Mary Ruthven <mruthven@chromium.org>
> Tested-by: Mary Ruthven <mruthven@chromium.org>
> Reviewed-by: Randall Spangler <rspangler@chromium.org>
Bug: b:62200096
Change-Id: I9e60fee9cdf381951f82ab8d58f4d202a52b43db
Reviewed-on: https://chromium-review.googlesource.com/1062685
Commit-Ready: Mary Ruthven <mruthven@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index c4e2bb1529..4c68dde651 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -232,8 +232,7 @@ const struct strap_desc strap_regs[] = { static struct board_cfg board_cfg_table[] = { /* SPI Variants: DIOA12 = 1M PD, DIOA6 = 1M PD */ /* Kevin/Gru: DI0A9 = 5k PD, DIOA1 = 1M PU */ - { 0x02, BOARD_SLAVE_CONFIG_SPI | BOARD_NEEDS_SYS_RST_PULL_UP | - BOARD_NEEDS_S3_TERM }, + { 0x02, BOARD_SLAVE_CONFIG_SPI | BOARD_NEEDS_SYS_RST_PULL_UP }, /* Poppy: DI0A9 = 1M PU, DIOA1 = 1M PU */ { 0x0A, BOARD_SLAVE_CONFIG_SPI | BOARD_USE_PLT_RESET }, |