From 19a21f6045a179852a3ee8e56cf33b8f1b6c8358 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 30 Dec 2020 16:48:40 -0700 Subject: volteer: Use the EC version of battery.c Instead of using a copy, bring in the file from the EC tree. Also add the baseboard charger.c file so that it builds. BUG=b:175434113 TEST=make BOARD=volteer -j30 build zephyr for volteer Change-Id: I52b006c4b73c399eecc5571b7f864b30d8bf9924 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2613607 Commit-Queue: Simon Glass Tested-by: Simon Glass Reviewed-by: Keith Short Reviewed-by: Jack Rosenthal Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2630173 Tested-by: Jack Rosenthal Reviewed-by: Simon Glass Commit-Queue: Jack Rosenthal --- zephyr/projects/volteer/CMakeLists.txt | 2 +- zephyr/projects/volteer/src/battery.c | 70 ---------------------------------- 2 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 zephyr/projects/volteer/src/battery.c diff --git a/zephyr/projects/volteer/CMakeLists.txt b/zephyr/projects/volteer/CMakeLists.txt index 61d7bbb7f4..188f284fca 100644 --- a/zephyr/projects/volteer/CMakeLists.txt +++ b/zephyr/projects/volteer/CMakeLists.txt @@ -36,9 +36,9 @@ target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/charger.c") target_sources(app PRIVATE "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c") # Include selected EC source for the board +target_sources(app PRIVATE "${PLATFORM_EC_BOARD}/battery.c") target_sources(app PRIVATE "${PLATFORM_EC_BOARD}/usbc_config.c") # Local sources to make things build. These are being removed as we are able # to build the EC source instead. -target_sources(app PRIVATE "src/battery.c") target_sources(app PRIVATE "src/pwrok_signals.c") diff --git a/zephyr/projects/volteer/src/battery.c b/zephyr/projects/volteer/src/battery.c deleted file mode 100644 index dab6c67b87..0000000000 --- a/zephyr/projects/volteer/src/battery.c +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Battery pack vendor provided charging profile - */ - -#include "common.h" -#include "battery_fuel_gauge.h" -#include "charger.h" -#include "util.h" -#include "../driver/charger/isl9241.h" - -/* - * Battery info for all Volteer battery types. Note that the fields - * start_charging_min/max and charging_min/max are not used for the charger. - * The effective temperature limits are given by discharging_min/max_c. - * - * Fuel Gauge (FG) parameters which are used for determining if the battery - * is connected, the appropriate ship mode (battery cutoff) command, and the - * charge/discharge FETs status. - * - * Ship mode (battery cutoff) requires 2 writes to the appropriate smart battery - * register. For some batteries, the charge/discharge FET bits are set when - * charging/discharging is active, in other types, these bits set mean that - * charging/discharging is disabled. Therefore, in addition to the mask for - * these bits, a disconnect value must be specified. Note that for TI fuel - * gauge, the charge/discharge FET status is found in Operation Status (0x54), - * but a read of Manufacturer Access (0x00) will return the lower 16 bits of - * Operation status which contains the FET status bits. - * - * The assumption for battery types supported is that the charge/discharge FET - * status can be read with a sb_read() command and therefore, only the register - * address, mask, and disconnect value need to be provided. - */ -const struct board_batt_params board_battery_info[] = { - /* LGC\011 L17L3PB0 Battery Information */ - /* - * Battery info provided by ODM on b/143477210, comment #11 - */ - [BATTERY_LGC011] = { - .fuel_gauge = { - .manuf_name = "LGC", - .ship_mode = { - .reg_addr = 0x00, - .reg_data = { 0x10, 0x10 }, - }, - .fet = { - .reg_addr = 0x0, - .reg_mask = 0x6000, - .disconnect_val = 0x6000, - } - }, - .batt_info = { - .voltage_max = TARGET_WITH_MARGIN(13200, 5), - .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 256, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = 0, - .discharging_max_c = 75, - }, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); - -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_LGC011; -- cgit v1.2.1