diff options
| author | Aaron Massey <aaronmassey@google.com> | 2021-10-04 13:35:16 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-11 17:15:12 +0000 |
| commit | 3f47176e6ce368747df41afcbd61199c7be8c292 (patch) | |
| tree | eb9655be4b52fbe15e245557c935c2b9015083c9 | |
| parent | e3389fa1e36e67fac8261096c3d8c1b56d9e26a4 (diff) | |
| download | chrome-ec-3f47176e6ce368747df41afcbd61199c7be8c292.tar.gz | |
zephyr: test: ln9310 fix emulator and newer chip powers_up tests
Due to a misunderstanding of the ln9310 software_enable function doc,
we were mistakenly testing that calling the ln9310_software_enable was
unnecessary to power up new versions of the chip.
This commit fixes the ln9310 emulator and driver tests to require
the ln9310_software_enable function in to power up the ln9310.
BRANCH=none
BUG=b:184856083
TEST=zmake configure --test zephyr/test/drivers
Signed-off-by: Aaron Massey <aaronmassey@chromium.org>
Cq-Depend: chromium:3200519
Change-Id: I5c5ddcc46342203298655342cc8b1365263d4f3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3202697
Commit-Queue: Aaron Massey <aaronmassey@google.com>
Tested-by: Aaron Massey <aaronmassey@google.com>
Reviewed-by: Yuval Peress <peress@google.com>
| -rw-r--r-- | zephyr/emul/emul_ln9310.c | 6 | ||||
| -rw-r--r-- | zephyr/test/drivers/src/ln9310.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c index 05bc0061f0..7150fda068 100644 --- a/zephyr/emul/emul_ln9310.c +++ b/zephyr/emul/emul_ln9310.c @@ -277,12 +277,6 @@ static int ln9310_emul_write_byte(struct i2c_emul *emul, int reg, uint8_t val, case LN9310_REG_PWR_CTRL: __ASSERT_NO_MSG(bytes == 1); data->power_ctrl_reg = val; - bool reset_standby = ((val & LN9310_PWR_OP_MODE_SWITCH21) || - (val & LN9310_PWR_OP_MODE_SWITCH31)) && - data->bc_sts_c_reg >= - LN9310_BC_STS_C_CHIP_REV_FIXED; - if (reset_standby) - data->startup_ctrl_reg &= ~LN9310_STARTUP_STANDBY_EN; break; case LN9310_REG_TIMER_CTRL: __ASSERT_NO_MSG(bytes == 1); diff --git a/zephyr/test/drivers/src/ln9310.c b/zephyr/test/drivers/src/ln9310.c index a9e4d8829c..c52c38b68d 100644 --- a/zephyr/test/drivers/src/ln9310.c +++ b/zephyr/test/drivers/src/ln9310.c @@ -33,7 +33,11 @@ static void test_ln9310_2s_powers_up(void) zassert_true(ln9310_emul_is_init(emulator), NULL); k_msleep(TEST_DELAY_MS); + zassert_false(ln9310_power_good(), NULL); + ln9310_software_enable(1); + + k_msleep(TEST_DELAY_MS); zassert_true(ln9310_power_good(), NULL); } @@ -53,7 +57,11 @@ static void test_ln9310_3s_powers_up(void) zassert_true(ln9310_emul_is_init(emulator), NULL); k_msleep(TEST_DELAY_MS); + zassert_false(ln9310_power_good(), NULL); + ln9310_software_enable(1); + + k_msleep(TEST_DELAY_MS); zassert_true(ln9310_power_good(), NULL); } |