Merge "power_supply: add POWER_SUPPLY_PROP_{COLD,HOT}_TEMP properties" (9ecbc587) · Commits · e / devices / android_kernel_sony_msm8998

drivers/power/power_supply_sysfs.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,8 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(low_power),
		POWER_SUPPLY_ATTR(temp_cool),
		POWER_SUPPLY_ATTR(temp_warm),
		POWER_SUPPLY_ATTR(temp_cold),
		POWER_SUPPLY_ATTR(temp_hot),
		POWER_SUPPLY_ATTR(system_temp_level),
		POWER_SUPPLY_ATTR(resistance),
		POWER_SUPPLY_ATTR(resistance_capacitive),

+15 −0

Original line number	Diff line number	Diff line
		@@ -3500,6 +3500,20 @@ static int fg_psy_set_property(struct power_supply *psy,
		return -EINVAL;
		}
		break;
		case POWER_SUPPLY_PROP_CHARGE_FULL:
		if (chip->cl.active) {
		pr_warn("Capacity learning active!\n");
		return 0;
		}
		if (pval->intval <= 0 \|\| pval->intval > chip->cl.nom_cap_uah) {
		pr_err("charge_full is out of bounds\n");
		return -EINVAL;
		}
		chip->cl.learned_cc_uah = pval->intval;
		rc = fg_save_learned_cap_to_sram(chip);
		if (rc < 0)
		pr_err("Error in saving learned_cc_uah, rc=%d\n", rc);
		break;
		default:
		break;
		}
		@@ -3515,6 +3529,7 @@ static int fg_property_is_writeable(struct power_supply *psy,
		case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
		case POWER_SUPPLY_PROP_CC_STEP:
		case POWER_SUPPLY_PROP_CC_STEP_SEL:
		case POWER_SUPPLY_PROP_CHARGE_FULL:
		return 1;
		default:
		break;

+2 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,8 @@ enum power_supply_property {
		POWER_SUPPLY_PROP_LOW_POWER,
		POWER_SUPPLY_PROP_COOL_TEMP,
		POWER_SUPPLY_PROP_WARM_TEMP,
		POWER_SUPPLY_PROP_COLD_TEMP,
		POWER_SUPPLY_PROP_HOT_TEMP,
		POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,
		POWER_SUPPLY_PROP_RESISTANCE,
		POWER_SUPPLY_PROP_RESISTANCE_CAPACITIVE,