From 6798fb493dbec19cf25775bad2ddbcdde9a13211 Mon Sep 17 00:00:00 2001 From: Rob Barnes Date: Tue, 5 Jan 2021 13:12:37 -0700 Subject: guybrush: Add AP18F4M battery type Add AP18F4M battery type. This may need to be moved out of baseboard and into variants depending on which batteries are supported. BUG=None TEST=Build BRANCH=None Change-Id: Ia267612e19c143a0a2b7fd2254b3ccf58ed1f563 Signed-off-by: Rob Barnes Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2611810 Commit-Queue: Denis Brockus Reviewed-by: Denis Brockus Reviewed-by: Diana Z --- baseboard/guybrush/baseboard.c | 57 ++++++++++++++++++++++++++++++++++++------ baseboard/guybrush/baseboard.h | 1 + 2 files changed, 51 insertions(+), 7 deletions(-) (limited to 'baseboard') diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index eb3f5dc5d0..7457e16666 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -231,10 +231,59 @@ struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT] = { }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); +/* + * Battery info for all Guybrush 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[] = { - /* TODO: Fill in guybrush battery configs */ + /* AP18F4M / LIS4163ACPC */ + [BATTERY_AP18F4M] = { + .fuel_gauge = { + .manuf_name = "Murata KT00404001", + .ship_mode = { + .reg_addr = 0x3A, + .reg_data = { 0xC574, 0xC574 }, + }, + .fet = { + .reg_addr = 0x0, + .reg_mask = 0x2000, + .disconnect_val = 0x2000, + } + }, + .batt_info = { + .voltage_max = 8700, + .voltage_normal = 7600, + .voltage_min = 5500, + .precharge_current = 256, + .start_charging_min_c = 0, + .start_charging_max_c = 50, + .charging_min_c = 0, + .charging_max_c = 60, + .discharging_min_c = -20, + .discharging_max_c = 75, + }, + }, }; BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); +const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_AP18F4M; const struct charger_config_t chg_chips[] = { { @@ -381,9 +430,3 @@ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) /* TODO */ return false; } - -int board_get_default_battery_type(void) -{ - /* TODO set DEFAULT_BATTERY_TYPE and remove this stub */ - return 0; -} diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index 26afc7546b..07035c239c 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -250,6 +250,7 @@ enum temp_sensor_id { /* Battery Types */ enum battery_type { + BATTERY_AP18F4M, BATTERY_TYPE_COUNT, }; -- cgit v1.2.1