diff options
| author | Tommy Chung <tommy.chung@quanta.corp-partner.google.com> | 2023-04-27 19:51:46 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-03 04:20:04 +0000 |
| commit | 4ce730711ac5e1272e4b0d23a24599f88a0c9840 (patch) | |
| tree | bc95d3b0460238344d2af4dd5c80dfde864e6d31 | |
| parent | 8d2745b4faa7ccd4fc522a311aba4f15c0d6d112 (diff) | |
| download | chrome-ec-4ce730711ac5e1272e4b0d23a24599f88a0c9840.tar.gz | |
yavilla: Update battery configs
BUG=b:280415504
TEST=make sure all batteries can be charged/discharged, cutoff.
Change-Id: I3a8a2afd6f614f8af4c6f4338c3f51327daadc98
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4483317
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Devin Lu <devin.lu@quantatw.com>
Commit-Queue: Tommy Chung <tommy.chung@quanta.corp-partner.google.com>
Tested-by: Tommy Chung <tommy.chung@quanta.corp-partner.google.com>
| -rw-r--r-- | zephyr/program/nissa/yavilla/overlay.dtsi | 26 | ||||
| -rw-r--r-- | zephyr/program/nissa/yavilla/src/charger.c | 18 |
2 files changed, 7 insertions, 37 deletions
diff --git a/zephyr/program/nissa/yavilla/overlay.dtsi b/zephyr/program/nissa/yavilla/overlay.dtsi index a93b02c51c..61bddb184b 100644 --- a/zephyr/program/nissa/yavilla/overlay.dtsi +++ b/zephyr/program/nissa/yavilla/overlay.dtsi @@ -20,28 +20,16 @@ batteries { default_battery: cosmx { - compatible = "cosmx,gh02047xl", "battery-smart"; + compatible = "cosmx,gg02047xl", "battery-smart"; }; - dynapack_atl_gh02047xl { - compatible = "dynapack,atl_gh02047xl", "battery-smart"; + dynapack_byd_gg02047xl { + compatible = "dynapack,byd_gg02047xl", "battery-smart"; }; - dynapack_cosmx_gh02047xl { - compatible = "dynapack,cosmx_gh02047xl", "battery-smart"; + dynapack_hpp_gg02047xl { + compatible = "dynapack,hpp_gg02047xl", "battery-smart"; }; - smp_coslight_gh02047xl { - compatible = "smp,coslight_gh02047xl", "battery-smart"; - }; - smp_highpower_gh02047xl { - compatible = "smp,highpower_gh02047xl", "battery-smart"; - }; - default_battery_3s:cosmx_si03058xl { - compatible = "cosmx,si03058xl", "battery-smart"; - }; - smp_highpower_si03058xl { - compatible = "smp,highpower_si03058xl", "battery-smart"; - }; - smp_si03054xl { - compatible = "smp,si03054xl", "battery-smart"; + atl_gb-s20-4473a9 { + compatible = "atl,gb-s20-4473a9", "battery-smart"; }; }; diff --git a/zephyr/program/nissa/yavilla/src/charger.c b/zephyr/program/nissa/yavilla/src/charger.c index 09484fb86a..18aa1068d0 100644 --- a/zephyr/program/nissa/yavilla/src/charger.c +++ b/zephyr/program/nissa/yavilla/src/charger.c @@ -4,7 +4,6 @@ */ #include "battery.h" -#include "battery_fuel_gauge.h" #include "charger.h" #include "console.h" #include "driver/charger/sm5803.h" @@ -54,20 +53,3 @@ __override void board_hibernate(void) LOG_INF("Charger(s) hibernated"); cflush(); } - -__override int board_get_default_battery_type(void) -{ - int type = DEFAULT_BATTERY_TYPE; - int cells; - - if (charger_get_battery_cells(CHARGER_PRIMARY, &cells) == EC_SUCCESS) { - if (cells == 3) - type = DEFAULT_BATTERY_TYPE_3S; - if (cells != 2 && cells != 3) - LOG_ERR("Unexpected number of cells"); - } else { - LOG_ERR("Failed to get default battery type"); - } - - return type; -} |