summaryrefslogtreecommitdiff
path: root/board/blipper/battery.c
diff options
context:
space:
mode:
authorMike Lee <mike5@huaqin.corp-partner.google.com>2021-02-27 15:45:13 +0800
committerCommit Bot <commit-bot@chromium.org>2021-03-09 02:24:44 +0000
commitbdced69a7fd420711386dcff446f4b5dda643db2 (patch)
tree98d65cc20c236817a33bf37b2a115a6356f37194 /board/blipper/battery.c
parent404e012c6cfad0ff06bbd4810eaff26a2bcc5c7f (diff)
downloadchrome-ec-bdced69a7fd420711386dcff446f4b5dda643db2.tar.gz
Blipper: EC initial image
Create blipper initial ec image BUG=b:181296159 BRANCH=dedede TEST=make BOARD=blipper OK Signed-off-by: Mike Lee <mike5@huaqin.corp-partner.google.com> Change-Id: Ie51580575ac917f25af60c5dafa089c606389a5f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2725476 Reviewed-by: Diana Z <dzigterman@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/blipper/battery.c')
-rw-r--r--board/blipper/battery.c299
1 files changed, 81 insertions, 218 deletions
diff --git a/board/blipper/battery.c b/board/blipper/battery.c
index f9c2e4531d..114cfbc313 100644
--- a/board/blipper/battery.c
+++ b/board/blipper/battery.c
@@ -10,7 +10,7 @@
#include "common.h"
/*
- * Battery info for all waddledee battery types. Note that the fields
+ * Battery info for all blipper 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.
*
@@ -32,298 +32,161 @@
* address, mask, and disconnect value need to be provided.
*/
const struct board_batt_params board_battery_info[] = {
- /* LGC AC15A8J Battery Information */
- [BATTERY_LGC15] = {
+ /* SMP L20M3PG0 Battery Information */
+ [BATTERY_SMP1] = {
.fuel_gauge = {
- .manuf_name = "LGC",
- .device_name = "AC15A8J",
+ .manuf_name = "SMP",
+ .device_name = "L20M3PG0",
.ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
+ .reg_addr = 0x34,
+ .reg_data = { 0x0000, 0x1000 },
},
.fet = {
- .mfgacc_support = 1,
- .reg_addr = 0x0,
- .reg_mask = 0x0002,
- .disconnect_val = 0x0,
+ .reg_addr = 0x00,
+ .reg_mask = 0x0018,
+ .disconnect_val = 0x0000,
+ .cfet_mask = 0x0008,
+ .cfet_off_val = 0x0000,
}
},
.batt_info = {
- .voltage_max = 13200,
+ .voltage_max = 13200, /* mV */
.voltage_normal = 11520, /* mV */
- .voltage_min = 9000, /* mV */
- .precharge_current = 256, /* mA */
+ .voltage_min = 9000, /* mV */
+ .precharge_current = 256, /* mA */
.start_charging_min_c = 0,
.start_charging_max_c = 50,
.charging_min_c = 0,
.charging_max_c = 60,
- .discharging_min_c = 0,
+ .discharging_min_c = -20,
.discharging_max_c = 60,
},
},
- /* Panasonic AP1505L Battery Information */
- [BATTERY_PANASONIC_AP15O5L] = {
+ /* SMP L20M3PG3 Battery Information */
+ [BATTERY_SMP2] = {
.fuel_gauge = {
- .manuf_name = "PANASONIC",
- .device_name = "AP15O5L",
+ .manuf_name = "SMP",
+ .device_name = "L20M3PG3",
.ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
+ .reg_addr = 0x34,
+ .reg_data = { 0x0000, 0x1000 },
},
.fet = {
- .reg_addr = 0x0,
- .reg_mask = 0x4000,
- .disconnect_val = 0x0,
+ .reg_addr = 0x00,
+ .reg_mask = 0x0018,
+ .disconnect_val = 0x0000,
+ .cfet_mask = 0x0008,
+ .cfet_off_val = 0x0000,
}
},
.batt_info = {
- .voltage_max = 13200,
- .voltage_normal = 11550, /* mV */
- .voltage_min = 9000, /* mV */
- .precharge_current = 256, /* mA */
+ .voltage_max = 13200, /* mV */
+ .voltage_normal = 11520, /* mV */
+ .voltage_min = 9000, /* mV */
+ .precharge_current = 256, /* mA */
.start_charging_min_c = 0,
.start_charging_max_c = 50,
.charging_min_c = 0,
.charging_max_c = 60,
- .discharging_min_c = 0,
+ .discharging_min_c = -20,
.discharging_max_c = 60,
},
},
- /* SANYO AC15A3J Battery Information */
- [BATTERY_SANYO] = {
+ /* LGC L20L3PG0 Battery Information */
+ [BATTERY_LGC] = {
.fuel_gauge = {
- .manuf_name = "SANYO",
+ .manuf_name = "LGC",
+ .device_name = "L20L3PG0",
.ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
+ .reg_addr = 0x34,
+ .reg_data = { 0x0000, 0x1000 },
},
.fet = {
- .reg_addr = 0x0,
- .reg_mask = 0x4000,
- .disconnect_val = 0x0,
+ .reg_addr = 0x00,
+ .reg_mask = 0x0018,
+ .disconnect_val = 0x0000,
+ .cfet_mask = 0x0008,
+ .cfet_off_val = 0x0000,
}
},
.batt_info = {
- .voltage_max = TARGET_WITH_MARGIN(13200, 5),
- .voltage_normal = 11550, /* mV */
- .voltage_min = 9000, /* mV */
- .precharge_current = 256, /* mA */
+ .voltage_max = 13200, /* mV */
+ .voltage_normal = 11520, /* mV */
+ .voltage_min = 9000, /* mV */
+ .precharge_current = 256, /* mA */
.start_charging_min_c = 0,
.start_charging_max_c = 50,
.charging_min_c = 0,
.charging_max_c = 60,
- .discharging_min_c = 0,
- .discharging_max_c = 60,
+ .discharging_min_c = -20,
+ .discharging_max_c = 73,
},
},
- /* Sony Ap13J4K Battery Information */
- [BATTERY_SONY] = {
+ /* Sunwoda L20D3PG0 Battery Information */
+ [BATTERY_SUNWODA] = {
.fuel_gauge = {
- .manuf_name = "SONYCorp",
+ .manuf_name = "Sunwoda",
+ .device_name = "L20D3PG0",
.ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
+ .reg_addr = 0x34,
+ .reg_data = { 0x0000, 0x1000 },
},
.fet = {
- .reg_addr = 0x0,
- .reg_mask = 0x8000,
- .disconnect_val = 0x8000,
- .cfet_mask = 0x4000,
- .cfet_off_val = 0x4000,
+ .reg_addr = 0x00,
+ .reg_mask = 0x0018,
+ .disconnect_val = 0x0000,
+ .cfet_mask = 0x0008,
+ .cfet_off_val = 0x0000,
}
},
.batt_info = {
- .voltage_max = TARGET_WITH_MARGIN(13200, 5),
- .voltage_normal = 11400, /* mV */
- .voltage_min = 9000, /* mV */
- .precharge_current = 256, /* mA */
+ .voltage_max = 13200, /* mV */
+ .voltage_normal = 11520, /* mV */
+ .voltage_min = 9000, /* mV */
+ .precharge_current = 205, /* mA */
.start_charging_min_c = 0,
.start_charging_max_c = 50,
.charging_min_c = 0,
.charging_max_c = 60,
- .discharging_min_c = 0,
+ .discharging_min_c = -20,
.discharging_max_c = 60,
},
},
- /* Simplo AP13J7K Battery Information */
- [BATTERY_SMP_AP13J7K] = {
+ /* Celxert L20C3PG0 Battery Information */
+ [BATTERY_CELXPERT] = {
.fuel_gauge = {
- .manuf_name = "SIMPLO",
- .device_name = "AP13J7K",
+ .manuf_name = "Celxpert",
+ .device_name = "L20C3PG0",
.ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
+ .reg_addr = 0x34,
+ .reg_data = { 0x0000, 0x1000 },
},
.fet = {
- .mfgacc_support = 1,
- .reg_addr = 0x0,
- .reg_mask = 0x0002,
+ .reg_addr = 0x00,
+ .reg_mask = 0x0018,
.disconnect_val = 0x0000,
+ .cfet_mask = 0x0008,
+ .cfet_off_val = 0x0000,
}
},
.batt_info = {
- .voltage_max = 13050,
- .voltage_normal = 11400, /* 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 = 60,
- },
- },
-
- /* Panasonic AC15A3J Battery Information */
- [BATTERY_PANASONIC_AC15A3J] = {
- .fuel_gauge = {
- .manuf_name = "PANASONIC",
- .device_name = "AC15A3J",
- .ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
- },
- .fet = {
- .reg_addr = 0x0,
- .reg_mask = 0x4000,
- .disconnect_val = 0x0,
- }
- },
- .batt_info = {
- .voltage_max = 13200,
- .voltage_normal = 11550, /* mV */
- .voltage_min = 9000, /* mV */
- .precharge_current = 256, /* mA */
- .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,
- },
- },
-
- /* LGC AP18C8K Battery Information */
- [BATTERY_LGC_AP18C8K] = {
- .fuel_gauge = {
- .manuf_name = "LGC KT0030G020",
- .device_name = "AP18C8K",
- .ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
- },
- .fet = {
- .reg_addr = 0x43,
- .reg_mask = 0x0001,
- .disconnect_val = 0x0,
- },
- },
- .batt_info = {
- .voltage_max = 13050,
- .voltage_normal = 11250,
- .voltage_min = 9000,
- .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,
- },
- },
-
- /* Murata AP18C4K Battery Information */
- [BATTERY_MURATA_AP18C4K] = {
- .fuel_gauge = {
- .manuf_name = "Murata KT00304012",
- .device_name = "AP18C4K",
- .ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
- },
- .fet = {
- .reg_addr = 0x0,
- .reg_mask = 0x2000,
- .disconnect_val = 0x2000,
- },
- },
- .batt_info = {
- .voltage_max = 13200,
- .voltage_normal = 11400,
- .voltage_min = 9000,
- .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,
- },
- },
-
- /* LGC AP19A8K Battery Information */
- [BATTERY_LGC_AP19A8K] = {
- .fuel_gauge = {
- .manuf_name = "LGC KTxxxxGxxx",
- .device_name = "AP19A8K",
- .ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
- },
- .fet = {
- .reg_addr = 0x43,
- .reg_mask = 0x0001,
- .disconnect_val = 0x0,
- },
- },
- .batt_info = {
- .voltage_max = 13200,
- .voltage_normal = 11550,
- .voltage_min = 9000,
- .precharge_current = 256,
+ .voltage_max = 13200, /* mV */
+ .voltage_normal = 11520, /* mV */
+ .voltage_min = 9000, /* mV */
+ .precharge_current = 200, /* mA */
.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,
- },
- },
-
- /* LGC KT0030G023 Battery Information */
- [BATTERY_LGC_G023] = {
- .fuel_gauge = {
- .manuf_name = "LGC KT0030G023",
- .device_name = "AP19A8K",
- .ship_mode = {
- .reg_addr = 0x3A,
- .reg_data = { 0xC574, 0xC574 },
- },
- .fet = {
- .reg_addr = 0x43,
- .reg_mask = 0x0001,
- .disconnect_val = 0x0,
- },
- },
- .batt_info = {
- .voltage_max = 13200,
- .voltage_normal = 11550,
- .voltage_min = 9000,
- .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,
+ .discharging_max_c = 60,
},
},
};
BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT);
-const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_PANASONIC_AC15A3J;
+const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_SMP1;