diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-01-29 00:49:56 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-29 01:53:50 +0000 |
| commit | 35746c59e2bb1bf8e63841eb44e9f78f014c80f0 (patch) | |
| tree | 09b519797e7bf290b4a5b10b6da0deb44643d22f | |
| parent | 3ea69a5c8a038a312bdd051f9d521f7eb5d626a6 (diff) | |
| download | chrome-ec-35746c59e2bb1bf8e63841eb44e9f78f014c80f0.tar.gz | |
Revert "ctn730: Add delay between INITIALIZATION and ENABLE"
This reverts commit de6e089385317a4379fa2e884d11da4453784a00.
Reason for revert: Replaced by CL:2657722
Original change's description:
> ctn730: Add delay between INITIALIZATION and ENABLE
>
> ctn730 isn't immediately ready for i2c write after normal mode
> initialization.
>
> This patch adds 5 msec delay between INITIALIZATION and ENABLE
> commands.
>
> BUG=b:173235954, b:178096436
> BRANCH=trogdor
> TEST=CoachZ
>
> Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
> Change-Id: Ic3c51212c2f9a7bca827b040166aa18ec0a06b63
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2656765
> Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Bug: b:173235954
Bug: b:178096436
Change-Id: If9323c6e40e7b88b5393ff645f2fe89e6231b2c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2657968
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/peripheral_charger.c | 8 | ||||
| -rw-r--r-- | driver/nfc/ctn730.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/common/peripheral_charger.c b/common/peripheral_charger.c index 326b0bb495..e907257452 100644 --- a/common/peripheral_charger.c +++ b/common/peripheral_charger.c @@ -296,7 +296,7 @@ static int pchg_run(struct pchg *ctx) } if (previous_state != ctx->state) - CPRINTS("->STATE_%s", _text_state(ctx->state)); + CPRINTS("->%s", _text_state(ctx->state)); ctx->event = PCHG_EVENT_NONE; @@ -358,6 +358,12 @@ void pchg_task(void *u) int p; int rv; + /* + * Without delay, after servo flash, ctn730 in RW always fails to write + * ENABLE_CMD (b:176824601). + */ + msleep(50); + /* In case we arrive here after power-on (for late sysjump) */ if (chipset_in_state(CHIPSET_STATE_ON)) pchg_startup(); diff --git a/driver/nfc/ctn730.c b/driver/nfc/ctn730.c index 087ea0daad..5528b8c5ec 100644 --- a/driver/nfc/ctn730.c +++ b/driver/nfc/ctn730.c @@ -266,12 +266,6 @@ static int ctn730_init(struct pchg *ctx) if (rv) return rv; - /* - * ctn730 isn't immediately ready for i2c write after normal mode - * initialization (b:178096436). - */ - msleep(5); - /* WLC-host should send EVT_HOST_CTRL_RESET_EVT shortly. */ return EC_SUCCESS_IN_PROGRESS; } |