From 7d937eff0e65baad3d15c2e1c161e214c212c4ac Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Tue, 17 Jan 2017 14:25:42 -0800 Subject: [PATCH 1/2] ARM: dts: msm: add batterydata to pmi8998 FG for msm8998 MTP and QRD Add batterydata phandle to pmi8998 FG device so that it can be used for obtaining the battery profiles that is required for msm8998 MTP and QRD platforms. Change-Id: I2255cd6475f3e49394cbdf3dd4594cb96fd70c31 Signed-off-by: Subbaraman Narayanamurthy --- arch/arm/boot/dts/qcom/msm8998-mtp.dtsi | 6 +++++- arch/arm/boot/dts/qcom/msm8998-qrd.dtsi | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi index c1d550a4bbff..a0e56f630eb7 100644 --- a/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -564,3 +564,7 @@ #include "fg-gen3-batterydata-demo-6000mah.dtsi" }; }; + +&pmi8998_fg { + qcom,battery-data = <&mtp_batterydata>; +}; diff --git a/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi b/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi index 150194a0e86f..af533bbfbc83 100644 --- a/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-qrd.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -510,13 +510,17 @@ }; /{ - mtp_batterydata: qcom,battery-data { + qrd_batterydata: qcom,battery-data { qcom,batt-id-range-pct = <15>; #include "fg-gen3-batterydata-itech-3000mah.dtsi" #include "fg-gen3-batterydata-ascent-3450mah.dtsi" }; }; +&pmi8998_fg { + qcom,battery-data = <&qrd_batterydata>; +}; + &mdss_mdp { qcom,mdss-pref-prim-intf = "dsi"; }; From 71894877700c6b2ba69fe3b843d7773010ef8711 Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Wed, 11 Jan 2017 17:20:31 -0800 Subject: [PATCH 2/2] ARM: dts: msm: update battery profiles for GEN3 FG Update the battery profiles for ascent, itech and st1031ga batteries that are used with 8998 platforms as per the recent characterized profile data. Change-Id: I8dda10320f216e8fe40fda405817c1afc3b436de Signed-off-by: Subbaraman Narayanamurthy --- .../fg-gen3-batterydata-ascent-3450mah.dtsi | 30 +++++------ .../fg-gen3-batterydata-itech-3000mah.dtsi | 50 +++++++++---------- ...gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi | 44 ++++++++-------- 3 files changed, 63 insertions(+), 61 deletions(-) diff --git a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-ascent-3450mah.dtsi b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-ascent-3450mah.dtsi index 76f7c498d2cd..c7cecbca3929 100644 --- a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-ascent-3450mah.dtsi +++ b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-ascent-3450mah.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -11,36 +11,36 @@ */ qcom,ascent_3450mah { - /* Ascent_with_connector_3450mAh_averaged_MasterSlave_Nov28th2016 */ + /* Ascent_with_connector_3450mAh_averaged_MasterSlave_Jan6th2017 */ qcom,max-voltage-uv = <4350000>; qcom,fg-cc-cv-threshold-mv = <4340>; qcom,fastchg-current-ma = <3450>; qcom,batt-id-kohm = <60>; qcom,battery-beta = <3435>; - qcom,battery-type = "ascent_3450mah_averaged_masterslave_nov28th2016"; - qcom,checksum = <0x2232>; - qcom,gui-version = "PMI8998GUI - 2.0.0.52"; + qcom,battery-type = "ascent_3450mah_averaged_masterslave_jan6th2017"; + qcom,checksum = <0x96AC>; + qcom,gui-version = "PMI8998GUI - 2.0.0.54"; qcom,fg-profile-data = [ 9C 1F 85 05 82 0A 73 FC - 2B 1D 6A EA - F2 03 63 0C - C8 17 F3 22 + 2B 1D 72 EA + EE 03 66 0C + C8 17 F4 22 E0 45 1F 52 5C 00 00 00 10 00 00 00 00 00 4A C4 C7 BC 48 C2 0F 00 08 00 - 92 00 5D ED - 8D FD B1 F3 - 27 00 A6 12 - 77 F4 0F 3B + E1 DA 5D ED + 8D FD B2 F3 + 96 E2 A7 12 + 7E F4 0E 3B 24 06 09 20 27 00 14 00 83 1F EE 05 1F 0A 45 FD - 6B 1D 52 E5 + 6B 1D 53 E5 EC 0B 31 14 44 18 49 23 18 45 A6 53 @@ -50,9 +50,9 @@ qcom,ascent_3450mah { B7 C3 0F BC 0F 00 00 00 92 00 5D ED - E3 06 81 F3 + E3 06 E0 00 75 FD 9C 03 - 43 DB B3 22 + 47 DB B3 22 CB 33 CC FF 07 10 00 00 99 0D 99 45 diff --git a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-itech-3000mah.dtsi b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-itech-3000mah.dtsi index d196a8074d8a..03801ee90589 100644 --- a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-itech-3000mah.dtsi +++ b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-itech-3000mah.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -11,37 +11,37 @@ */ qcom,itech_3000mah { - /* #Itech_B00826LF_3000mAh_ver1660_averaged_MasterSlave_Jul20th2016*/ + /* #Itech_B00826LF_3000mAh_ver1660_averaged_MasterSlave_Jan10th2017*/ qcom,max-voltage-uv = <4350000>; qcom,fg-cc-cv-threshold-mv = <4340>; qcom,fastchg-current-ma = <3000>; qcom,batt-id-kohm = <100>; - qcom,battery-beta = <3450>; - qcom,battery-type = "itech_b00826lf_3000mah_ver1660"; - qcom,checksum = <0xE06B>; - qcom,gui-version = "PMI8998GUI - 0.0.0.82"; + qcom,battery-beta = <3435>; + qcom,battery-type = "itech_b00826lf_3000mah_ver1660_jan10th2017"; + qcom,checksum = <0xFB8F>; + qcom,gui-version = "PMI8998GUI - 2.0.0.54"; qcom,fg-profile-data = [ A4 1F 6E 05 - 9C 0A 16 06 - 32 1D 24 E5 - 61 0B 1B 15 + 9C 0A 2B FC + 32 1D 23 E5 + 60 0B 1B 15 AD 17 8C 22 - EB 3C 87 4A + EA 3C 89 4A 5B 00 00 00 12 00 00 00 00 00 62 C2 0C CD D8 C2 - 19 00 0C 00 - 7E 00 C7 EC - E3 05 5D FA - 97 F5 12 12 - C2 05 90 3B - 22 09 40 40 - 07 00 05 00 - 7D 1F DE 05 - 3F 0A 73 06 - 72 1D E2 F5 - 6F 12 BF 1D + 19 00 08 00 + 85 EA C7 EC + E2 05 2F 01 + 9B F5 12 12 + 5E 05 88 3B + 22 06 09 20 + 27 00 14 00 + 7D 1F DD 05 + 3F 0A E5 FC + 72 1D E3 F5 + 6F 12 C0 1D 88 18 FB 22 8D 45 C6 52 54 00 00 00 @@ -51,12 +51,12 @@ qcom,itech_3000mah { 14 00 00 00 7E 00 C7 EC 60 06 BB 00 - B3 FC 61 03 - 6A 06 78 1B - B3 33 08 33 + 59 06 61 03 + D9 FC 75 1B + B3 33 CC FF 07 10 00 00 3E 0B 99 45 - 14 00 19 00 + 14 00 40 00 AE 01 0A FA FF 00 00 00 00 00 00 00 diff --git a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi index e023a7700437..8cbb29aac927 100644 --- a/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi +++ b/arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -11,34 +11,36 @@ */ qcom,qrd_msm8998_skuk_3000mah { + /* QRD8997_ST1031GA_3000mAh_averaged_MasterSlave_Jan10th2017 */ qcom,max-voltage-uv = <4400000>; qcom,fastchg-current-ma = <3000>; qcom,batt-id-kohm = <68>; qcom,battery-beta = <3380>; - qcom,battery-type = "qrd_msm8998_skuk_300mah"; - qcom,checksum = <0x0F19>; + qcom,battery-type = "qrd8997_st1031ga_3000mah"; + qcom,checksum = <0xD299>; + qcom,gui-version = "PMI8998GUI - 2.0.0.54"; qcom,fg-profile-data = [ - 6F 1F B2 05 - 6E 0A A3 FC - 8C 1D DB FD - C2 12 AE 1D - 7E 18 00 23 - 8D 45 B4 52 + 70 1F B1 05 + 6F 0A A1 FC + 8C 1D D7 FD + C4 12 AC 1D + 7E 18 01 23 + 8C 45 B6 52 55 00 00 00 0F 00 00 00 00 00 92 C5 95 CD A0 CA - 1F 00 0C 00 - 56 F2 C3 EC - 7B 06 27 F3 + 1F 00 08 00 + 9F E3 C3 EC + F7 FC 25 F3 02 01 FF 12 - 1C DA 21 3A - 1C 09 40 40 - 07 00 05 00 + 29 DC 1D 3A + 1C 06 09 20 + 27 00 14 00 AC 1F B4 05 57 0A EF FC - 6A 1D 2E 00 - 12 0B BA 14 + 6A 1D E9 E2 + 11 0B BB 14 40 19 DC 22 79 45 03 53 53 00 00 00 @@ -48,12 +50,12 @@ qcom,qrd_msm8998_skuk_3000mah { 1C 00 00 00 56 F2 C3 EC A6 06 A2 F2 - 96 06 C7 01 - 8B EA CF 1A - BA 33 08 33 + 9A 06 CC 01 + 8C EA CF 1A + BA 33 CC FF 07 10 00 00 3A 0C 66 46 - 1C 00 19 00 + 1C 00 40 00 98 01 0A FA FF 00 00 00 00 00 00 00