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

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

Merge "ARM: dts: msm: Add battery-type DT property"

parents 36971a95 f3facca0

Documentation/devicetree/bindings/batterydata/batterydata.txt

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Profile data node required properties: 
			used as an array which could support multiple IDs for one battery

			module when the ID resistance of some battery modules goes across

			several ranges.

- qcom,battery-type : A string indicating the type of battery.



Profile data node required subnodes:

- qcom,fcc-temp-lut : An 1-dimensional lookup table node that encodes
@@ -83,6 +84,7 @@ qcom,palladium-batterydata { 
	qcom,v-cutoff-uv = <3400000>;

	qcom,chg-term-ua = <100000>;

	qcom,batt-id-kohm = <75>;

	qcom,battery-type = "palladium_1500mah";



	qcom,fcc-temp-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 65>;

arch/arm/boot/dts/qti/batterydata-mtp-3000mah.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ qcom,mtp-3000mah { 
	qcom,v-cutoff-uv = <3400000>;

	qcom,chg-term-ua = <200000>;

	qcom,batt-id-kohm = <300>;

	qcom,battery-type = "mtp_3000mah";



	qcom,fcc-temp-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

arch/arm/boot/dts/qti/batterydata-palladium.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ qcom,palladium-batterydata { 
	qcom,v-cutoff-uv = <3400000>;

	qcom,chg-term-ua = <100000>;

	qcom,batt-id-kohm = <75>;

	qcom,battery-type = "palladium_1500mah";



	qcom,fcc-temp-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

arch/arm/boot/dts/qti/batterydata-qrd-4v2-1300mah.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ qcom,qrd-4v2-1300mah-data { 
	qcom,v-cutoff-uv = <3400000>;

	qcom,chg-term-ua = <100000>;

	qcom,batt-id-kohm = <100>;

	qcom,battery-type = "qrd_4v2_1300mah";



	qcom,rbatt-sf-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

arch/arm/boot/dts/qti/batterydata-qrd-4v2-1800mah.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ qcom,qrd-4v2-1800mah-data { 
	qcom,v-cutoff-uv = <3400000>;

	qcom,chg-term-ua = <100000>;

	qcom,batt-id-kohm = <47>;

	qcom,battery-type = "qrd_4v2_1800mah";



	qcom,rbatt-sf-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;