diff options
| -rw-r--r-- | baseboard/guybrush/baseboard.c | 55 | ||||
| -rw-r--r-- | baseboard/guybrush/baseboard.h | 6 | ||||
| -rw-r--r-- | board/guybrush/battery.c | 63 | ||||
| -rw-r--r-- | board/guybrush/board.h | 6 | ||||
| -rw-r--r-- | board/guybrush/build.mk | 2 |
5 files changed, 70 insertions, 62 deletions
diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c index fa48959478..353018142a 100644 --- a/baseboard/guybrush/baseboard.c +++ b/baseboard/guybrush/baseboard.c @@ -257,61 +257,6 @@ 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[] = { - /* 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[] = { { .i2c_port = I2C_PORT_CHARGER, diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index a068e03f12..9bac43d8ef 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -315,12 +315,6 @@ enum sensor_id { SENSOR_COUNT, }; -/* Battery Types */ -enum battery_type { - BATTERY_AP18F4M, - BATTERY_TYPE_COUNT, -}; - /* PWM Channels */ enum pwm_channel { PWM_CH_FAN = 0, diff --git a/board/guybrush/battery.c b/board/guybrush/battery.c new file mode 100644 index 0000000000..a7fa6ee449 --- /dev/null +++ b/board/guybrush/battery.c @@ -0,0 +1,63 @@ +/* Copyright 2021 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 "battery_fuel_gauge.h" + +/* + * 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[] = { + /* 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; diff --git a/board/guybrush/board.h b/board/guybrush/board.h index ae6d9fd1cd..bcfbc719bd 100644 --- a/board/guybrush/board.h +++ b/board/guybrush/board.h @@ -49,6 +49,12 @@ /* Motion sensor interrupt */ void motion_interrupt(enum gpio_signal signal); +/* Battery Types */ +enum battery_type { + BATTERY_AP18F4M, + BATTERY_TYPE_COUNT, +}; + #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/guybrush/build.mk b/board/guybrush/build.mk index 4324e2b034..5c8bde1a2b 100644 --- a/board/guybrush/build.mk +++ b/board/guybrush/build.mk @@ -9,4 +9,4 @@ BASEBOARD:=guybrush board-y=board.o -board-y+=board_fw_config.o led.o +board-y+=board_fw_config.o led.o battery.o |