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

Commit 7e6a8194 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: update current and voltage tables for PMi8996"

parents e843c341 eaa68440

Documentation/devicetree/bindings/power/qpnp-smbcharger.txt

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ end of this file. 
			limiting configuration.

- qcom,dc-chgpth:	DC charge path detection and input current

			limiting configuration.

- qcom,chg-misc:	Miscellaneous features such as safety timers

- qcom,chg-misc:	Miscellaneous features such as watchdog timers

			and SYSOK pin control

- qcom,chg-otg:		OTG configuration control.
@@ -86,7 +86,7 @@ Sub node required properties: 
						valid threshold.



			qcom,chgr-misc:

			 - safety-timeout-mins:	Charger watchdog timer

			 - wdog-timeout-mins:	Charger watchdog timer

						interrupt.

			 - temp-shutdown:	Triggers when charger goes

						overtemp and causes a shutdown.
@@ -370,7 +370,7 @@ Example: 


			interrupt-names =	"power-ok",

						"temp-shutdown",

						"safety-timeout",

						"wdog-timeout",

						"flash-fail",

						"otst2",

						"otst3";

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

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ 


				interrupt-names =	"power-ok",

							"temp-shutdown",

							"safety-timeout",

							"wdog-timeout",

							"flash-fail",

							"otst2",

							"otst3";

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

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ 


				interrupt-names =	"power-ok",

							"temp-shutdown",

							"safety-timeout",

							"wdog-timeout",

							"flash-fail",

							"otst2",

							"otst3";

drivers/platform/msm/qpnp-revid.c

+5 −0
Original line number Diff line number Diff line
@@ -179,6 +179,11 @@ static int qpnp_revid_probe(struct spmi_device *spmi) 
	revid_chip->data.pmic_subtype = pmic_subtype;

	revid_chip->data.pmic_type = pmic_type;



	if (pmic_subtype < ARRAY_SIZE(pmic_names))

		revid_chip->data.pmic_name = pmic_names[pmic_subtype];

	else

		revid_chip->data.pmic_name = pmic_names[0];



	mutex_lock(&revid_chips_lock);

	list_add(&revid_chip->link, &revid_chips);

	mutex_unlock(&revid_chips_lock);

drivers/power/qpnp-smbcharger.c

+304 −163

File changed.

Preview size limit exceeded, changes collapsed.