power_supply: Charger-Manager: Add properties for power-supply-class

Charger Manager provides power-supply-class aggregating
information from multiple chargers and a fuel-gauge.

Signed-off-by: Donggeun Kim <dg77.kim@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

3 files changed, 325 insertions, 1 deletions

diff --git a/Documentation/power/charger-manager.txt b/Documentation/power/charger-manager.txt
index 081489f3db25..fdcca991df30 100644
--- a/Documentation/power/charger-manager.txt
+++ b/Documentation/power/charger-manager.txt
@@ -98,6 +98,11 @@ battery), an instance of Charger Manager is attached to it.
 
 struct charger_desc {
 
+char *psy_name;
+        : The power-supply-class name of the battery. Default is
+        "battery" if psy_name is NULL. Users can access the psy entries
+        at "/sys/class/power_supply/[psy_name]/".
+
 enum polling_modes polling_mode;
         : CM_POLL_DISABLE: do not poll this battery.
           CM_POLL_ALWAYS: always poll this battery.
@@ -106,6 +111,12 @@ enum polling_modes polling_mode;
           CM_POLL_CHARGING_ONLY: poll this battery if and only if the
                                  battery is being charged.
 
+unsigned int fullbatt_uV;
+        : If specified with a non-zero value, Charger Manager assumes
+        that the battery is full (capacity = 100) if the battery is not being
+        charged and the battery voltage is equal to or greater than
+        fullbatt_uV.
+
 unsigned int polling_interval_ms;
         : Required polling interval in ms. Charger Manager will poll
         this battery every polling_interval_ms or more frequently.
@@ -131,10 +142,13 @@ char *psy_fuel_gauge;
         : Power-supply-class name of the fuel gauge.
 
 int (*temperature_out_of_range)(int *mC);
+bool measure_battery_temp;
         : This callback returns 0 if the temperature is safe for charging,
         a positive number if it is too hot to charge, and a negative number
         if it is too cold to charge. With the variable mC, the callback returns
         the temperature in 1/1000 of centigrade.
+        The source of temperature can be battery or ambient one according to
+        the value of measure_battery_temp.
 };
 
 5. Other Considerations
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 727a259ea46c..0378d019efae 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -122,6 +122,32 @@ static bool is_ext_pwr_online(struct charger_manager *cm)
 }
 
 /**
+ * get_batt_uV - Get the voltage level of the battery
+ * @cm: the Charger Manager representing the battery.
+ * @uV: the voltage level returned.
+ *
+ * Returns 0 if there is no error.
+ * Returns a negative value on error.
+ */
+static int get_batt_uV(struct charger_manager *cm, int *uV)
+{
+        union power_supply_propval val;
+        int ret;
+
+        if (cm->fuel_gauge)
+                ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
+                                POWER_SUPPLY_PROP_VOLTAGE_NOW, &val);
+        else
+                return -ENODEV;
+
+        if (ret)
+                return ret;
+
+        *uV = val.intval;
+        return 0;
+}
+
+/**
  * is_charging - Returns true if the battery is being charged.
  * @cm: the Charger Manager representing the battery.
  */
@@ -369,6 +395,208 @@ static bool cm_monitor(void)
         return stop;
 }
 
+static int charger_get_property(struct power_supply *psy,
+                enum power_supply_property psp,
+                union power_supply_propval *val)
+{
+        struct charger_manager *cm = container_of(psy,
+                        struct charger_manager, charger_psy);
+        struct charger_desc *desc = cm->desc;
+        int i, ret = 0, uV;
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_STATUS:
+                if (is_charging(cm))
+                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
+                else if (is_ext_pwr_online(cm))
+                        val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+                else
+                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                break;
+        case POWER_SUPPLY_PROP_HEALTH:
+                if (cm->emergency_stop > 0)
+                        val->intval = POWER_SUPPLY_HEALTH_OVERHEAT;
+                else if (cm->emergency_stop < 0)
+                        val->intval = POWER_SUPPLY_HEALTH_COLD;
+                else
+                        val->intval = POWER_SUPPLY_HEALTH_GOOD;
+                break;
+        case POWER_SUPPLY_PROP_PRESENT:
+                if (is_batt_present(cm))
+                        val->intval = 1;
+                else
+                        val->intval = 0;
+                break;
+        case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+                ret = get_batt_uV(cm, &i);
+                val->intval = i;
+                break;
+        case POWER_SUPPLY_PROP_CURRENT_NOW:
+                ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
+                                POWER_SUPPLY_PROP_CURRENT_NOW, val);
+                break;
+        case POWER_SUPPLY_PROP_TEMP:
+                /* in thenth of centigrade */
+                if (cm->last_temp_mC == INT_MIN)
+                        desc->temperature_out_of_range(&cm->last_temp_mC);
+                val->intval = cm->last_temp_mC / 100;
+                if (!desc->measure_battery_temp)
+                        ret = -ENODEV;
+                break;
+        case POWER_SUPPLY_PROP_TEMP_AMBIENT:
+                /* in thenth of centigrade */
+                if (cm->last_temp_mC == INT_MIN)
+                        desc->temperature_out_of_range(&cm->last_temp_mC);
+                val->intval = cm->last_temp_mC / 100;
+                if (desc->measure_battery_temp)
+                        ret = -ENODEV;
+                break;
+        case POWER_SUPPLY_PROP_CAPACITY:
+                if (!cm->fuel_gauge) {
+                        ret = -ENODEV;
+                        break;
+                }
+
+                if (!is_batt_present(cm)) {
+                        /* There is no battery. Assume 100% */
+                        val->intval = 100;
+                        break;
+                }
+
+                ret = cm->fuel_gauge->get_property(cm->fuel_gauge,
+                                        POWER_SUPPLY_PROP_CAPACITY, val);
+                if (ret)
+                        break;
+
+                if (val->intval > 100) {
+                        val->intval = 100;
+                        break;
+                }
+                if (val->intval < 0)
+                        val->intval = 0;
+
+                /* Do not adjust SOC when charging: voltage is overrated */
+                if (is_charging(cm))
+                        break;
+
+                /*
+                 * If the capacity value is inconsistent, calibrate it base on
+                 * the battery voltage values and the thresholds given as desc
+                 */
+                ret = get_batt_uV(cm, &uV);
+                if (ret) {
+                        /* Voltage information not available. No calibration */
+                        ret = 0;