diff options
author | Edward Hill <ecgh@chromium.org> | 2020-08-07 18:13:16 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-08-11 00:31:14 +0000 |
commit | 9b8b61ce037f0d4d740936edf86076accce54297 (patch) | |
tree | 637aca1671fe5dcb70ee4fdf660afbc4bbf0ffeb /board/trembyle | |
parent | 7b8b449a79b545d00fd1c8f49e56ae65ee3cd8a2 (diff) | |
download | chrome-ec-9b8b61ce037f0d4d740936edf86076accce54297.tar.gz |
trembyle: Use board_version for I2C_PORT_CHARGER_V0
Change to use CBI board_version for I2C_PORT_CHARGER_V0 instead
of probing I2C.
BUG=b:155214765
BRANCH=none
TEST=boot to OS
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: Id3e9d874439277af4d1c88acd6ab40a6bbea73ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2343742
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board/trembyle')
-rw-r--r-- | board/trembyle/board.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/board/trembyle/board.c b/board/trembyle/board.c index 95fd43fec8..5a8f36e0fe 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -8,6 +8,7 @@ #include "adc.h" #include "adc_chip.h" #include "button.h" +#include "charger.h" #include "cbi_ec_fw_config.h" #include "driver/accelgyro_bmi_common.h" #include "driver/accel_kionix.h" @@ -310,7 +311,17 @@ BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); * Use FW_CONFIG to set correct configuration. */ -void setup_fw_config(void) +static void setup_v0_charger(void) +{ + chg_chips[0].i2c_port = I2C_PORT_CHARGER_V0; +} +/* + * Use HOOK_PRIO_INIT_I2C so we re-map before charger_chips_init() + * talks to the charger. + */ +DECLARE_HOOK(HOOK_INIT, setup_v0_charger, HOOK_PRIO_INIT_I2C); + +static void setup_fw_config(void) { /* Enable Gyro interrupts */ gpio_enable_interrupt(GPIO_6AXIS_INT_L); @@ -323,6 +334,7 @@ void setup_fw_config(void) if (ec_config_has_hdmi_conn_hpd()) ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); } +/* Use HOOK_PRIO_INIT_I2C + 2 to be after ioex_init(). */ DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); /***************************************************************************** |