diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-08-07 17:24:23 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-11 00:27:05 +0000 |
| commit | 7b8b449a79b545d00fd1c8f49e56ae65ee3cd8a2 (patch) | |
| tree | aeae4f9b998e5f35a71dd12ef15e80b3bb7b01e4 /board | |
| parent | cbff2a675bea572f600fee350cdd87b869b0b72a (diff) | |
| download | chrome-ec-7b8b449a79b545d00fd1c8f49e56ae65ee3cd8a2.tar.gz | |
dalboz: Use board_version for I2C_PORT_BATTERY_V0
Change to use CBI board_version for I2C_PORT_BATTERY_V0 instead
of probing I2C.
BUG=b:155214765
BRANCH=none
TEST=boot to OS
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I2fd64bb51b91df028335f960a329da957af52aae
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2343761
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/dalboz/board.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/board/dalboz/board.c b/board/dalboz/board.c index 462cd4bc4b..93d7e325b0 100644 --- a/board/dalboz/board.c +++ b/board/dalboz/board.c @@ -570,6 +570,9 @@ static void setup_fw_config(void) gpio_set_flags(GPIO_6AXIS_INT_L, GPIO_INPUT | GPIO_PULL_DOWN); } } +/* + * Use HOOK_PRIO_INIT_I2C + 2 to be after ioex_init(). + */ DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); const struct pwm_t pwm_channels[] = { @@ -619,19 +622,17 @@ static void usba_retimer_off(void) } DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, usba_retimer_off, HOOK_PRIO_DEFAULT); -/* - * If the battery is found on the V0 I2C port then re-map the battery port. - * Use HOOK_PRIO_INIT_I2C so we re-map before init_battery_type() and - * charger_chips_init() want to talk to the battery. - */ static void check_v0_battery(void) { - int status; + uint32_t board_version = 0; - if (i2c_read16(I2C_PORT_BATTERY_V0, BATTERY_ADDR_FLAGS, - SB_BATTERY_STATUS, &status) == EC_SUCCESS) { - ccprints("V0 HW detected"); + cbi_get_board_version(&board_version); + + if (board_version == 1) I2C_PORT_BATTERY = I2C_PORT_BATTERY_V0; - } } +/* + * Use HOOK_PRIO_INIT_I2C so we re-map before init_battery_type() and + * charger_chips_init() want to talk to the battery. + */ DECLARE_HOOK(HOOK_INIT, check_v0_battery, HOOK_PRIO_INIT_I2C); |