Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a781770 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-smbcharger: add api to force charger tlim"

parents bd75e2d4 7fead985

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ 
			qcom,cycle-counter-high-soc = <85>;

			qcom,capacity-learning-on;

			qcom,fg-cc-cv-threshold-mv = <4340>;

			qcom,pmic-revid = <&pmi8994_revid>;



			qcom,fg-soc@4000 {

				status = "okay";
@@ -455,7 +456,7 @@ 
				qcom,qpnp-lab-switching-clock-frequency = <1600>;

				qcom,qpnp-lab-limit-maximum-current = <800>;

				qcom,qpnp-lab-limit-max-current-enable;

				qcom,qpnp-lab-ps-threshold = <40>;

				qcom,qpnp-lab-ps-threshold = <20>;

				qcom,qpnp-lab-ps-enable;

				qcom,qpnp-lab-nfet-size = <100>;

				qcom,qpnp-lab-pfet-size = <100>;

drivers/platform/msm/qpnp-revid.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -208,7 +208,7 @@ static void __exit qpnp_revid_exit(void) 
	return spmi_driver_unregister(&qpnp_revid_driver);

}



module_init(qpnp_revid_init);

subsys_initcall(qpnp_revid_init);

module_exit(qpnp_revid_exit);



MODULE_DESCRIPTION("QPNP REVID DRIVER");

drivers/power/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(charge_done),

	POWER_SUPPLY_ATTR(allow_detection),

	POWER_SUPPLY_ATTR(flash_active),

	POWER_SUPPLY_ATTR(force_tlim),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

	/* Properties of type `const char *' */

drivers/power/qpnp-fg.c

+376 −160

File changed.

Preview size limit exceeded, changes collapsed.

drivers/power/qpnp-smbcharger.c

+492 −118

File changed.

Preview size limit exceeded, changes collapsed.