diff options
| -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 e907257452..326b0bb495 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("->%s", _text_state(ctx->state)); + CPRINTS("->STATE_%s", _text_state(ctx->state)); ctx->event = PCHG_EVENT_NONE; @@ -358,12 +358,6 @@ 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 5528b8c5ec..087ea0daad 100644 --- a/driver/nfc/ctn730.c +++ b/driver/nfc/ctn730.c @@ -266,6 +266,12 @@ 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; } |