evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qpnp-fg-gen3: Use the correct property name to get fastcharge current"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-13 12:18:00 -08:00 • committed by Gerrit - the friendly Code Review server
commit f25d55e62e
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/qcom/fg-gen3-batterydata-ascent-3450mah.dtsi
View file

@ -14,7 +14,7 @@ qcom,ascent_3450mah {
/* Ascent_with_connector_3450mAh_averaged_MasterSlave_Nov28th2016 */ /* Ascent_with_connector_3450mAh_averaged_MasterSlave_Nov28th2016 */
qcom,max-voltage-uv = <4350000>; qcom,max-voltage-uv = <4350000>;
qcom,fg-cc-cv-threshold-mv = <4340>; qcom,fg-cc-cv-threshold-mv = <4340>;
qcom,nom-batt-capacity-mah = <3450>; qcom,fastchg-current-ma = <3450>;
qcom,batt-id-kohm = <60>; qcom,batt-id-kohm = <60>;
qcom,battery-beta = <3435>; qcom,battery-beta = <3435>;
qcom,battery-type = "ascent_3450mah_averaged_masterslave_nov28th2016"; qcom,battery-type = "ascent_3450mah_averaged_masterslave_nov28th2016";

2
arch/arm/boot/dts/qcom/fg-gen3-batterydata-demo-6000mah.dtsi
View file

@ -13,7 +13,7 @@
qcom,demo_6000mah { qcom,demo_6000mah {
qcom,max-voltage-uv = <4350000>; qcom,max-voltage-uv = <4350000>;
qcom,fg-cc-cv-threshold-mv = <4340>; qcom,fg-cc-cv-threshold-mv = <4340>;
qcom,nom-batt-capacity-mah = <6000>; qcom,fastchg-current-ma = <6000>;
qcom,batt-id-kohm = <75>; qcom,batt-id-kohm = <75>;
qcom,battery-beta = <3435>; qcom,battery-beta = <3435>;
qcom,battery-type = "Demo_battery_6000mah"; qcom,battery-type = "Demo_battery_6000mah";

2
arch/arm/boot/dts/qcom/fg-gen3-batterydata-itech-3000mah.dtsi
View file

@ -14,7 +14,7 @@ qcom,itech_3000mah {
/* #Itech_B00826LF_3000mAh_ver1660_averaged_MasterSlave_Jul20th2016*/ /* #Itech_B00826LF_3000mAh_ver1660_averaged_MasterSlave_Jul20th2016*/
qcom,max-voltage-uv = <4350000>; qcom,max-voltage-uv = <4350000>;
qcom,fg-cc-cv-threshold-mv = <4340>; qcom,fg-cc-cv-threshold-mv = <4340>;
qcom,nom-batt-capacity-mah = <3000>; qcom,fastchg-current-ma = <3000>;
qcom,batt-id-kohm = <100>; qcom,batt-id-kohm = <100>;
qcom,battery-beta = <3450>; qcom,battery-beta = <3450>;
qcom,battery-type = "itech_b00826lf_3000mah_ver1660"; qcom,battery-type = "itech_b00826lf_3000mah_ver1660";

2
arch/arm/boot/dts/qcom/fg-gen3-batterydata-qrd-skuk-4v4-3000mah.dtsi
View file

@ -12,7 +12,7 @@
qcom,qrd_msm8998_skuk_3000mah { qcom,qrd_msm8998_skuk_3000mah {
qcom,max-voltage-uv = <4400000>; qcom,max-voltage-uv = <4400000>;
qcom,nom-batt-capacity-mah = <3000>; qcom,fastchg-current-ma = <3000>;
qcom,batt-id-kohm = <68>; qcom,batt-id-kohm = <68>;
qcom,battery-beta = <3380>; qcom,battery-beta = <3380>;
qcom,battery-type = "qrd_msm8998_skuk_300mah"; qcom,battery-type = "qrd_msm8998_skuk_300mah";

4
drivers/power/qcom-charger/qpnp-fg-gen3.c
View file

@ -824,10 +824,10 @@ static int fg_get_batt_profile(struct fg_chip *chip)
chip->bp.float_volt_uv = -EINVAL; chip->bp.float_volt_uv = -EINVAL;
} }
rc = of_property_read_u32(profile_node, "qcom,nom-batt-capacity-mah", rc = of_property_read_u32(profile_node, "qcom,fastchg-current-ma",
&chip->bp.fastchg_curr_ma); &chip->bp.fastchg_curr_ma);
if (rc < 0) { if (rc < 0) {
pr_err("battery nominal capacity unavailable, rc:%d\n", rc); pr_err("battery fastchg current unavailable, rc:%d\n", rc);
chip->bp.fastchg_curr_ma = -EINVAL; chip->bp.fastchg_curr_ma = -EINVAL;
} }