diff options
| author | Dawid Niedzwiecki <dawidn@google.com> | 2022-04-19 12:21:49 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-25 07:48:25 +0000 |
| commit | 6ac6ca93622b53700dec96b4349112493639122c (patch) | |
| tree | 9d6c1ebf99bdf55a9eca60ddbd854f9215a91518 /zephyr/projects | |
| parent | 50c74adb974b713eae7e8eabe005d0e108f218a7 (diff) | |
| download | chrome-ec-6ac6ca93622b53700dec96b4349112493639122c.tar.gz | |
zephyr: nissa: add charger chips
Add charger chips nodes to DTS for nissa boards 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: Iaac05fa93d242fa3191eb907784dee1bc8724885
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3593043
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Andrew McRae <amcrae@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>
Diffstat (limited to 'zephyr/projects')
| -rw-r--r-- | zephyr/projects/nissa/nereid_overlay.dts | 10 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nivviks_overlay.dts | 10 | ||||
| -rw-r--r-- | zephyr/projects/nissa/src/nereid/charger.c | 14 | ||||
| -rw-r--r-- | zephyr/projects/nissa/src/nivviks/charger.c | 14 |
4 files changed, 20 insertions, 28 deletions
diff --git a/zephyr/projects/nissa/nereid_overlay.dts b/zephyr/projects/nissa/nereid_overlay.dts index a23c070359..d64e265c3a 100644 --- a/zephyr/projects/nissa/nereid_overlay.dts +++ b/zephyr/projects/nissa/nereid_overlay.dts @@ -201,6 +201,11 @@ compatible = "pericom,pi3usb9201"; port = <&i2c_ec_i2c_usb_c0>; }; + chg { + compatible = "siliconmitus,sm5803"; + status = "okay"; + port = <&i2c_ec_i2c_usb_c0>; + }; }; port1@1 { compatible = "named-usbc-port"; @@ -209,6 +214,11 @@ compatible = "pericom,pi3usb9201"; port = <&i2c_ec_i2c_sub_usb_c1>; }; + chg { + compatible = "siliconmitus,sm5803"; + status = "okay"; + port = <&i2c_ec_i2c_sub_usb_c1>; + }; }; }; }; diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts index fe06623e75..80fb01693f 100644 --- a/zephyr/projects/nissa/nivviks_overlay.dts +++ b/zephyr/projects/nissa/nivviks_overlay.dts @@ -192,6 +192,11 @@ * usb_c0_interrupt. */ }; + chg { + compatible = "intersil,isl923x"; + status = "okay"; + port = <&i2c_ec_i2c_usb_c0>; + }; }; /* * TODO(b:211693800): port1 may not be present on some @@ -204,6 +209,11 @@ compatible = "pericom,pi3usb9201"; port = <&i2c_ec_i2c_sub_usb_c1>; }; + chg { + compatible = "intersil,isl923x"; + status = "okay"; + port = <&i2c_ec_i2c_sub_usb_c1>; + }; }; }; diff --git a/zephyr/projects/nissa/src/nereid/charger.c b/zephyr/projects/nissa/src/nereid/charger.c index 98b83c57d7..2835944d39 100644 --- a/zephyr/projects/nissa/src/nereid/charger.c +++ b/zephyr/projects/nissa/src/nereid/charger.c @@ -15,20 +15,6 @@ LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL); -const struct charger_config_t chg_chips[] = { - { - .i2c_port = I2C_PORT_USB_C0_TCPC, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, - }, - /* Sub-board */ - { - .i2c_port = I2C_PORT_USB_C1_TCPC, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, - }, -}; - int extpower_is_present(void) { int port; diff --git a/zephyr/projects/nissa/src/nivviks/charger.c b/zephyr/projects/nissa/src/nivviks/charger.c index 507ca36f65..8e97926aaa 100644 --- a/zephyr/projects/nissa/src/nivviks/charger.c +++ b/zephyr/projects/nissa/src/nivviks/charger.c @@ -15,20 +15,6 @@ LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL); -const struct charger_config_t chg_chips[] = { - { - .i2c_port = I2C_PORT_USB_C0_TCPC, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, - /* Sub-board */ - { - .i2c_port = I2C_PORT_USB_C1_TCPC, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, -}; - int extpower_is_present(void) { int port; |