diff options
author | Aseda Aboagye <aaboagye@google.com> | 2017-11-29 17:30:15 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2017-12-18 20:33:00 -0800 |
commit | 1ca59fb7b13768569910bedbc8204265b62ba02f (patch) | |
tree | ded9959d371215de01b9e2e3f63f3a56a088a6f7 | |
parent | bbb40ce21d7a972c812621091390a994c6fce4b6 (diff) | |
download | chrome-ec-1ca59fb7b13768569910bedbc8204265b62ba02f.tar.gz |
meowth: zoombini: Mask off 5V PGOOD and COMP_C.
The boards need to have 5V masked off from the power good tree.
Additionially, Meowth needs to have the COMP_C fault masked from the
fault mask because its enable is connected and not grounded like on
Zoombini.
BUG=b:69935563
BRANCH=None
TEST=flash zoombini; Verify that we can boot to S0.
Change-Id: Ia51004a131e7c31d0e5ee59d87ab13455b822779
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/807632
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r-- | board/zoombini/board.c | 13 | ||||
-rw-r--r-- | driver/pmic_tps650x30.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/board/zoombini/board.c b/board/zoombini/board.c index 1001bb4f9d..ea3fb89dca 100644 --- a/board/zoombini/board.c +++ b/board/zoombini/board.c @@ -404,12 +404,21 @@ static void board_pmic_init(void) gpio_set_level(GPIO_PMIC_EN, 1); /* + * Mask COMP_C fault. Meowth has the enable connected, but no PGOOD. + * Zoombini has the enable grounded, so it's fine to mask it for + * zoombini as well. + */ + if (i2c_write8(I2C_PORT_PMIC, PMIC_I2C_ADDR, + TPS650X30_REG_PWFAULT_MASK2, 1)) + cprints(CC_SYSTEM, "failed to mask pwfault_mask2"); + + /* * PGMASK1 : Mask VCCIO and 5V from Power Good Tree * [7] : 1b MVCCIOPG is masked. - * [2] : 1b MV5APG is masked. + * [6] : 1b MV5APG is masked. */ if (i2c_write8(I2C_PORT_PMIC, PMIC_I2C_ADDR, TPS650X30_REG_PGMASK1, - (1 << 7) | (1 << 2))) + ((1 << 7) | (1 << 6)))) cprints(CC_SYSTEM, "PMIC init failed!"); else cprints(CC_SYSTEM, "PMIC init'd"); diff --git a/driver/pmic_tps650x30.h b/driver/pmic_tps650x30.h index 16b923d640..5198686800 100644 --- a/driver/pmic_tps650x30.h +++ b/driver/pmic_tps650x30.h @@ -28,6 +28,7 @@ #define TPS650X30_REG_DISCHCNT3 0x3E #define TPS650X30_REG_DISCHCNT4 0x3F #define TPS650X30_REG_PWFAULT_MASK1 0xE5 +#define TPS650X30_REG_PWFAULT_MASK2 0xE6 /* TPS650X30 register values */ #define TPS650X30_VENDOR_ID 0x22 |