From 655139da363f7fadea969a3b85f21d388b2ccbc7 Mon Sep 17 00:00:00 2001 From: Drew Abbott Date: Tue, 30 Jun 2020 15:52:06 -0500 Subject: [PATCH] Increment dm_ver The new battery profile was added, but the dm_ver was never incremented. The driver will not update the configuration on the chips until it sees a new dm_ver, so this is required to actually see the effects of the new battery configuration files. NO_PROP_NEEDED: this only affects smith and the new battery profiles for smith Change-Id: Ie5714c8b7a02227027aef994727417fbe2beac5d Reviewed-on: https://gerrit.mot.com/1653126 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Bernie Moreno Reviewed-by: Ling Jin Submit-Approved: Jira Key --- .../smith_battery_flip_LS40_0629-bq27426G1-2766.gm.fs.h | 6 +++--- .../smith_battery_main_LS30_0615-bq27426G1-2767.gm.fs.h | 6 +++--- drivers/power/bq27426_fg_mmi/bq27426_fg_mmi.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_flip_LS40_0629-bq27426G1-2766.gm.fs.h b/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_flip_LS40_0629-bq27426G1-2766.gm.fs.h index 5f70375a9367..214ba8a81c65 100644 --- a/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_flip_LS40_0629-bq27426G1-2766.gm.fs.h +++ b/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_flip_LS40_0629-bq27426G1-2766.gm.fs.h @@ -183,14 +183,14 @@ const bqfs_cmd_t smith_flip_bqfs_image[] = { .cmd_type = CMD_W, .addr = 0xAA, .reg = 0x40, - .data = {.bytes = {0x64, 0x78, 0x0F, 0x9F, 0x23, 0x00, 0x00, 0x14, 0x04, 0x00, 0x09, 0x04, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, + .data = {.bytes = {0x64, 0x78, 0x0F, 0x9F, 0x23, 0x02, 0x00, 0x14, 0x04, 0x00, 0x09, 0x04, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, .data_len = 32, }, { .cmd_type = CMD_W, .addr = 0xAA, .reg = 0x60, - .data = {.bytes = {0x07}}, + .data = {.bytes = {0x05}}, .data_len = 1, }, { @@ -208,7 +208,7 @@ const bqfs_cmd_t smith_flip_bqfs_image[] = { .cmd_type = CMD_C, .addr = 0xAA, .reg = 0x60, - .data = {.bytes = {0x07}}, + .data = {.bytes = {0x05}}, .data_len = 1, }, { diff --git a/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_main_LS30_0615-bq27426G1-2767.gm.fs.h b/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_main_LS30_0615-bq27426G1-2767.gm.fs.h index b9e576293bdb..6418b136a1db 100644 --- a/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_main_LS30_0615-bq27426G1-2767.gm.fs.h +++ b/drivers/power/bq27426_fg_mmi/battery_profile/imported/smith_battery_main_LS30_0615-bq27426G1-2767.gm.fs.h @@ -183,14 +183,14 @@ const bqfs_cmd_t smith_main_bqfs_image[] = { .cmd_type = CMD_W, .addr = 0xAA, .reg = 0x40, - .data = {.bytes = {0x64, 0x78, 0x0F, 0x9F, 0x23, 0x00, 0x00, 0x14, 0x04, 0x00, 0x09, 0x04, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, + .data = {.bytes = {0x64, 0x78, 0x0F, 0x9F, 0x23, 0x02, 0x00, 0x14, 0x04, 0x00, 0x09, 0x04, 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, .data_len = 32, }, { .cmd_type = CMD_W, .addr = 0xAA, .reg = 0x60, - .data = {.bytes = {0x07}}, + .data = {.bytes = {0x05}}, .data_len = 1, }, { @@ -208,7 +208,7 @@ const bqfs_cmd_t smith_main_bqfs_image[] = { .cmd_type = CMD_C, .addr = 0xAA, .reg = 0x60, - .data = {.bytes = {0x07}}, + .data = {.bytes = {0x05}}, .data_len = 1, }, { diff --git a/drivers/power/bq27426_fg_mmi/bq27426_fg_mmi.c b/drivers/power/bq27426_fg_mmi/bq27426_fg_mmi.c index 161448e7c4a4..e7d2486f246e 100644 --- a/drivers/power/bq27426_fg_mmi/bq27426_fg_mmi.c +++ b/drivers/power/bq27426_fg_mmi/bq27426_fg_mmi.c @@ -203,11 +203,11 @@ static const struct fg_batt_profile bqfs_image[] = { #endif #ifdef ATL_LS30_1255MAH_BATTERY_PROFILE - {.batt_type_str = "LS30_ATL_1255MAH", .bqfs_image = smith_main_bqfs_image, .array_size = ARRAY_SIZE(smith_main_bqfs_image), .chem_id = 0x2767, .dm_ver = 1}, + {.batt_type_str = "LS30_ATL_1255MAH", .bqfs_image = smith_main_bqfs_image, .array_size = ARRAY_SIZE(smith_main_bqfs_image), .chem_id = 0x2767, .dm_ver = 2}, #endif #ifdef ATL_LS40_1545MAH_BATTERY_PROFILE - {.batt_type_str = "LS40_ATL_1545MAH", .bqfs_image = smith_flip_bqfs_image, .array_size = ARRAY_SIZE(smith_flip_bqfs_image), .chem_id = 0x2766, .dm_ver = 1}, + {.batt_type_str = "LS40_ATL_1545MAH", .bqfs_image = smith_flip_bqfs_image, .array_size = ARRAY_SIZE(smith_flip_bqfs_image), .chem_id = 0x2766, .dm_ver = 2}, #endif };