arm64: configs: add some devfreq gov for rk3399 linux

[firefly-linux-kernel-4.4.55.git] / drivers / power / power_supply_sysfs.c

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 1f7d79b03725fcb6aad3c8ccfef0549fc7d6e85c..280018d59d5a60fab0b7d97145bbff25761bd8aa 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -73,19 +73,20 @@ static ssize_t power_supply_show_property(struct device *dev,
        const ptrdiff_t off = attr - power_supply_attrs;
        union power_supply_propval value;
 
-       if (off == POWER_SUPPLY_PROP_TYPE)
-               value.intval = psy->type;
-       else
-               ret = psy->get_property(psy, off, &value);
-
-       if (ret < 0) {
-               if (ret == -ENODATA)
-                       dev_dbg(dev, "driver has no data for `%s' property\n",
-                               attr->attr.name);
-               else if (ret != -ENODEV)
-                       dev_err(dev, "driver failed to report `%s' property: %zd\n",
-                               attr->attr.name, ret);
-               return ret;
+       if (off == POWER_SUPPLY_PROP_TYPE) {
+               value.intval = psy->desc->type;
+       } else {
+               ret = power_supply_get_property(psy, off, &value);
+
+               if (ret < 0) {
+                       if (ret == -ENODATA)
+                               dev_dbg(dev, "driver has no data for `%s' property\n",
+                                       attr->attr.name);
+                       else if (ret != -ENODEV)
+                               dev_err(dev, "driver failed to report `%s' property: %zd\n",
+                                       attr->attr.name, ret);
+                       return ret;
+               }
        }
 
        if (off == POWER_SUPPLY_PROP_STATUS)
@@ -121,13 +122,13 @@ static ssize_t power_supply_store_property(struct device *dev,
        long long_val;
 
        /* TODO: support other types than int */
-       ret = strict_strtol(buf, 10, &long_val);
+       ret = kstrtol(buf, 10, &long_val);
        if (ret < 0)
                return ret;
 
        value.intval = long_val;
 
-       ret = psy->set_property(psy, off, &value);
+       ret = power_supply_set_property(psy, off, &value);
        if (ret < 0)
                return ret;
 
@@ -152,9 +153,11 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(voltage_now),
        POWER_SUPPLY_ATTR(voltage_avg),
        POWER_SUPPLY_ATTR(voltage_ocv),
+       POWER_SUPPLY_ATTR(voltage_boot),
        POWER_SUPPLY_ATTR(current_max),
        POWER_SUPPLY_ATTR(current_now),
        POWER_SUPPLY_ATTR(current_avg),
+       POWER_SUPPLY_ATTR(current_boot),
        POWER_SUPPLY_ATTR(power_now),
        POWER_SUPPLY_ATTR(power_avg),
        POWER_SUPPLY_ATTR(charge_full_design),
@@ -170,6 +173,7 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(constant_charge_voltage_max),
        POWER_SUPPLY_ATTR(charge_control_limit),
        POWER_SUPPLY_ATTR(charge_control_limit_max),
+       POWER_SUPPLY_ATTR(input_current_limit),
        POWER_SUPPLY_ATTR(energy_full_design),
        POWER_SUPPLY_ATTR(energy_empty_design),
        POWER_SUPPLY_ATTR(energy_full),
@@ -181,6 +185,8 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(capacity_alert_max),
        POWER_SUPPLY_ATTR(capacity_level),
        POWER_SUPPLY_ATTR(temp),
+       POWER_SUPPLY_ATTR(temp_max),
+       POWER_SUPPLY_ATTR(temp_min),
        POWER_SUPPLY_ATTR(temp_alert_min),
        POWER_SUPPLY_ATTR(temp_alert_max),
        POWER_SUPPLY_ATTR(temp_ambient),
@@ -192,6 +198,8 @@ static struct device_attribute power_supply_attrs[] = {
        POWER_SUPPLY_ATTR(time_to_full_avg),
        POWER_SUPPLY_ATTR(type),
        POWER_SUPPLY_ATTR(scope),
+       POWER_SUPPLY_ATTR(charge_term_current),
+       POWER_SUPPLY_ATTR(calibrate),
        /* Local extensions */
        POWER_SUPPLY_ATTR(usb_hc),
        POWER_SUPPLY_ATTR(usb_otg),
@@ -219,12 +227,12 @@ static umode_t power_supply_attr_is_visible(struct kobject *kobj,
        if (attrno == POWER_SUPPLY_PROP_TYPE)
                return mode;
 
-       for (i = 0; i < psy->num_properties; i++) {
-               int property = psy->properties[i];
+       for (i = 0; i < psy->desc->num_properties; i++) {
+               int property = psy->desc->properties[i];
 
                if (property == attrno) {
-                       if (psy->property_is_writeable &&
-                           psy->property_is_writeable(psy, property) > 0)
+                       if (psy->desc->property_is_writeable &&
+                           psy->desc->property_is_writeable(psy, property) > 0)
                                mode |= S_IWUSR;
 
                        return mode;
@@ -280,14 +288,14 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)
 
        dev_dbg(dev, "uevent\n");
 
-       if (!psy || !psy->dev) {
+       if (!psy || !psy->desc) {
                dev_dbg(dev, "No power supply yet\n");
                return ret;
        }
 
-       dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->name);
+       dev_dbg(dev, "POWER_SUPPLY_NAME=%s\n", psy->desc->name);
 
-       ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->name);
+       ret = add_uevent_var(env, "POWER_SUPPLY_NAME=%s", psy->desc->name);
        if (ret)
                return ret;
 
@@ -295,11 +303,11 @@ int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env)
        if (!prop_buf)
                return -ENOMEM;
 
-       for (j = 0; j < psy->num_properties; j++) {
+       for (j = 0; j < psy->desc->num_properties; j++) {
                struct device_attribute *attr;
                char *line;
 
-               attr = &power_supply_attrs[psy->properties[j]];
+               attr = &power_supply_attrs[psy->desc->properties[j]];
 
                ret = power_supply_show_property(dev, attr, prop_buf);
                if (ret == -ENODEV || ret == -ENODATA) {