diff options
| author | Dawid Niedzwiecki <dawidn@google.com> | 2022-04-19 12:21:24 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-25 07:48:15 +0000 |
| commit | 50c74adb974b713eae7e8eabe005d0e108f218a7 (patch) | |
| tree | e34541c34b4eee96bec14e2b30f2462032dfa762 | |
| parent | 7df4606572d341eb029a78e6b5b79bf314bdd4ea (diff) | |
| download | chrome-ec-50c74adb974b713eae7e8eabe005d0e108f218a7.tar.gz | |
zephyr: intelrvp: add charger chips
Add charger chips nodes to DTS for the intelrvp board and remove
declaring the array in board-specific code.
The change shouldn't affect how the charger works.
BUG=b:228237412
TEST=zmake testall && check with "charger" cc if a proper charger is
preset && check if DUT is being charged correctly
BRANCH=main
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I10d2fb04c4c9a9d4fc8906e300b16bed80a7d850
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3593042
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts | 2 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts | 5 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/src/adlrvp.c | 9 |
3 files changed, 6 insertions, 10 deletions
diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts index 9b01ad8cf8..448f470987 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/adlrvp_npcx.dts @@ -24,7 +24,7 @@ i2c-port = <&i2c7_0>; enum-name = "I2C_PORT_BATTERY"; }; - charger { + i2c_charger: charger { i2c-port = <&i2c7_0>; enum-name = "I2C_PORT_CHARGER"; }; diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts index 021027932b..ec6f2091ac 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/usbc.dts @@ -16,6 +16,11 @@ port = <&typec_0>; i2c-addr-flags = "FUSB302_I2C_ADDR_FLAGS"; }; + chg { + compatible = "intersil,isl9241"; + status = "okay"; + port = <&i2c_charger>; + }; }; port1@1 { diff --git a/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c b/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c index 9f358cc512..275a3c90f4 100644 --- a/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c +++ b/zephyr/projects/intelrvp/adlrvp/src/adlrvp.c @@ -216,15 +216,6 @@ BUILD_ASSERT(ARRAY_SIZE(bb_controls) == CONFIG_USB_PD_PORT_MAX_COUNT); /* Cache BB retimer power state */ static bool cache_bb_enable[CONFIG_USB_PD_PORT_MAX_COUNT]; -/* Charger Chips */ -struct charger_config_t chg_chips[] = { - { - .i2c_port = I2C_PORT_CHARGER, - .i2c_addr_flags = ISL9241_ADDR_FLAGS, - .drv = &isl9241_drv, - }, -}; - void board_overcurrent_event(int port, int is_overcurrented) { /* Port 0 & 1 and 2 & 3 share same line for over current indication */ |