Merge "power: pm8921-charger: use trickle time for trickle charging" into msm-3.0
diff --git a/drivers/power/pm8921-charger.c b/drivers/power/pm8921-charger.c
index 82582c4..303dd99 100644
--- a/drivers/power/pm8921-charger.c
+++ b/drivers/power/pm8921-charger.c
@@ -2229,7 +2229,7 @@
}
if (chip->ttrkl_time != 0) {
- rc = pm_chg_ttrkl_max_set(chip, chip->safety_time);
+ rc = pm_chg_ttrkl_max_set(chip, chip->ttrkl_time);
if (rc) {
pr_err("Failed to set trkl time to %d minutes rc=%d\n",
chip->safety_time, rc);
diff --git a/include/linux/mfd/pm8xxx/pm8921-charger.h b/include/linux/mfd/pm8xxx/pm8921-charger.h
index aeb88b2..73067b7 100644
--- a/include/linux/mfd/pm8xxx/pm8921-charger.h
+++ b/include/linux/mfd/pm8xxx/pm8921-charger.h
@@ -35,8 +35,10 @@
/**
* struct pm8921_charger_platform_data -
- * @safety_time: max charging time in minutes
+ * @safety_time: max charging time in minutes incl. fast and trkl
+ * valid range 4 to 512 min. PON default 120 min
* @ttrkl_time: max trckl charging time in minutes
+ * valid range 1 to 64 mins. PON default 15 min
* @update_time: how often the userland be updated of the charging (msec)
* @max_voltage: the max voltage (mV) the battery should be charged up to
* @min_voltage: the voltage (mV) where charging method switches from