summaryrefslogtreecommitdiff
path: root/board/oak/board.c
diff options
context:
space:
mode:
authorDiana Z <dzigterman@chromium.org>2020-01-30 15:30:06 -0700
committerCommit Bot <commit-bot@chromium.org>2020-02-04 22:10:57 +0000
commitd6db0a0c88b80b8505a3c139e06a63203433e8ea (patch)
tree24a3b7ab4ee8ef618328feb929c31bf26608108c /board/oak/board.c
parentccc649887ba991c82a338359c0e415e7e2d0698e (diff)
downloadchrome-ec-d6db0a0c88b80b8505a3c139e06a63203433e8ea.tar.gz
Charger: Convert boards to use new driver structure
This commit removes the temporary common charger chip configuration and instead puts the configuration in each board. BRANCH=none BUG=b:147672225 TEST=builds, runs on waddledoo and octopus Change-Id: If81aef31e48c65999a87e202494f286716114bbb Signed-off-by: Diana Z <dzigterman@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2031855 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/oak/board.c')
-rw-r--r--board/oak/board.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/board/oak/board.c b/board/oak/board.c
index da4c6cbb7a..f830aa646b 100644
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -20,6 +20,7 @@
#include "driver/accel_kx022.h"
#include "driver/accelgyro_bmi160.h"
#include "driver/als_opt3001.h"
+#include "driver/charger/isl923x.h"
#include "driver/tcpm/tcpci.h"
#include "driver/temp_sensor/tmp432.h"
#include "driver/usb_mux/pi3usb3x532.h"
@@ -150,6 +151,25 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);
+#if BOARD_REV == OAK_REV1
+const struct charger_config_t chg_chips[] = {
+ {
+ .i2c_port = I2C_PORT_CHARGER,
+ .i2c_addr_flags = I2C_ADDR_CHARGER_FLAGS,
+ .drv = &bq2477x_drv,
+ },
+};
+#else
+const struct charger_config_t chg_chips[] = {
+ {
+ .i2c_port = I2C_PORT_CHARGER,
+ .i2c_addr_flags = ISL923X_ADDR_FLAGS,
+ .drv = &isl923x_drv,
+ },
+};
+#endif /* OAK_REV1 */
+const unsigned int chg_cnt = ARRAY_SIZE(chg_chips);
+
/*
* Temperature sensors data; must be in same order as enum temp_sensor_id.
* Sensor index and name must match those present in coreboot: