diff options
author | Jacky Wang <jacky5_wang@pegatron.corp-partner.google.com> | 2020-12-11 11:35:51 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-12-11 21:29:13 +0000 |
commit | edd893be3ef133bbc4c02bc9c60790863044bd9f (patch) | |
tree | e4c8909075d576cb95a1539518bfe1cb68c46788 | |
parent | 46826ee4fcaecc8d4a5b31eb3a7bf6c7e85d5166 (diff) | |
download | chrome-ec-edd893be3ef133bbc4c02bc9c60790863044bd9f.tar.gz |
galtic: Config the EC battery setting.
Config the EC battery setting depend on battery spec.
BUG=b:175350831
BRANCH=firmware-dedede-13606.B
TEST=BOARD=galtic
1. Check battery found on EC log.
2. Check battery cutoff function on EC console.
3. Check battery charging FET status when battery full.
Signed-off-by: Jacky Wang <jacky5_wang@pegatron.corp-partner.google.com>
Change-Id: I691a4726791522e6dd548ef482665f231eb2d656
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2584549
Reviewed-by: Michael5 Chen <michael5_chen1@pegatron.corp-partner.google.com>
Reviewed-by: Henry Sun <henrysun@google.com>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Michael5 Chen <michael5_chen1@pegatron.corp-partner.google.com>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r-- | board/galtic/battery.c | 290 | ||||
-rw-r--r-- | board/galtic/board.h | 11 |
2 files changed, 14 insertions, 287 deletions
diff --git a/board/galtic/battery.c b/board/galtic/battery.c index 6b77248624..2c9f0ccdeb 100644 --- a/board/galtic/battery.c +++ b/board/galtic/battery.c @@ -32,298 +32,34 @@ * address, mask, and disconnect value need to be provided. */ const struct board_batt_params board_battery_info[] = { - /* LGC AC15A8J Battery Information */ - [BATTERY_LGC15] = { + [BATTERY_C140254] = { .fuel_gauge = { - .manuf_name = "LGC", - .device_name = "AC15A8J", + .manuf_name = "AS3GXXE3KA", + .device_name = "C140254", .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, + .reg_addr = 0x00, + .reg_data = { 0x0010, 0x0010 }, }, .fet = { - .mfgacc_support = 1, - .reg_addr = 0x0, - .reg_mask = 0x0002, - .disconnect_val = 0x0, + .reg_addr = 0x99, + .reg_mask = 0x000C, + .disconnect_val = 0x000C, } }, .batt_info = { - .voltage_max = 13200, - .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, - }, - }, - - /* Panasonic AP1505L Battery Information */ - [BATTERY_PANASONIC_AP15O5L] = { - .fuel_gauge = { - .manuf_name = "PANASONIC", - .device_name = "AP15O5L", - .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 = 0, - .discharging_max_c = 60, - }, - }, - - /* SANYO AC15A3J Battery Information */ - [BATTERY_SANYO] = { - .fuel_gauge = { - .manuf_name = "SANYO", - .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, - }, - .fet = { - .reg_addr = 0x0, - .reg_mask = 0x4000, - .disconnect_val = 0x0, - } - }, - .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 = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = 0, - .discharging_max_c = 60, - }, - }, - - /* Sony Ap13J4K Battery Information */ - [BATTERY_SONY] = { - .fuel_gauge = { - .manuf_name = "SONYCorp", - .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, - }, - .fet = { - .reg_addr = 0x0, - .reg_mask = 0x8000, - .disconnect_val = 0x8000, - .cfet_mask = 0x4000, - .cfet_off_val = 0x4000, - } - }, - .batt_info = { - .voltage_max = TARGET_WITH_MARGIN(13200, 5), - .voltage_normal = 11400, /* 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, - }, - }, - - /* Simplo AP13J7K Battery Information */ - [BATTERY_SMP_AP13J7K] = { - .fuel_gauge = { - .manuf_name = "SIMPLO", - .device_name = "AP13J7K", - .ship_mode = { - .reg_addr = 0x3A, - .reg_data = { 0xC574, 0xC574 }, - }, - .fet = { - .mfgacc_support = 1, - .reg_addr = 0x0, - .reg_mask = 0x0002, - .disconnect_val = 0x0000, - } - }, - .batt_info = { - .voltage_max = 13050, - .voltage_normal = 11400, /* mV */ - .voltage_min = 9000, /* mV */ + .voltage_max = 8900, /* mV */ + .voltage_normal = 7970, /* mV */ + .voltage_min = 6000, /* 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, - .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_C140254; diff --git a/board/galtic/board.h b/board/galtic/board.h index 0449e9f22f..f152dba213 100644 --- a/board/galtic/board.h +++ b/board/galtic/board.h @@ -127,16 +127,7 @@ enum temp_sensor_id { /* List of possible batteries */ enum battery_type { - BATTERY_LGC15, - BATTERY_PANASONIC_AP15O5L, - BATTERY_SANYO, - BATTERY_SONY, - BATTERY_SMP_AP13J7K, - BATTERY_PANASONIC_AC15A3J, - BATTERY_LGC_AP18C8K, - BATTERY_MURATA_AP18C4K, - BATTERY_LGC_AP19A8K, - BATTERY_LGC_G023, + BATTERY_C140254, BATTERY_TYPE_COUNT, }; |