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

Commit bbb01bac 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 VADC and ADC_TM channels"

parents d52907fe fcee8af5

arch/arm/boot/dts/msm-pmd9635.dtsi

+61 −0
Original line number Diff line number Diff line
@@ -320,5 +320,66 @@ 
			reg = <0x4f00 0x100>;

			status = "disabled";

		};



		pmd9635_vadc: vadc@3100 {

			compatible = "qcom,qpnp-vadc";

			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

			interrupt-names = "eoc-int-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;

			qcom,vadc-poll-eoc;



			chan@8 {

				label = "die_temp";

				reg = <8>;

				qcom,decimation = <0>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <3>;

				qcom,hw-settle-time = <0>;

				qcom,fast-avg-setup = <0>;

			};



			chan@9 {

				label = "ref_625mv";

				reg = <9>;

				qcom,decimation = <0>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

				qcom,hw-settle-time = <0>;

				qcom,fast-avg-setup = <0>;

			};



			chan@a {

				label = "ref_1250v";

				reg = <0xa>;

				qcom,decimation = <0>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

				qcom,hw-settle-time = <0>;

				qcom,fast-avg-setup = <0>;

			};

		};



		pmd9635_adc_tm: vadc@3400 {

			compatible = "qcom,qpnp-adc-tm";

			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

				     <0x0 0x34 0x4>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";

			qcom,adc-bit-resolution = <15>;

			qcom,adc-vdd-reference = <1800>;

			qcom,adc_tm-vadc = <&pmd9635_vadc>;

		};

	};

};

arch/arm/boot/dts/msmkrypton-cdp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -58,12 +58,24 @@ 
	};



	mpp@a300 { /* MPP 4 */

		/* VADC channel 19 */

		qcom,mode = <4>;

		qcom,ain-route = <3>; /* AMUX 8 */

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* Function constant */

		qcom,invert = <1>;

	};



	mpp@a400 { /* MPP 5 */

	};



	mpp@a500 { /* MPP 6 */

		/* channel 21 */

		qcom,mode = <4>;

		qcom,ain-route = <1>; /* AMUX 6 */

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* Function constant */

		qcom,invert = <1>;

	};

};

arch/arm/boot/dts/msmkrypton-mtp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -58,12 +58,24 @@ 
	};



	mpp@a300 { /* MPP 4 */

		/* VADC channel 19 */

		qcom,mode = <4>;

		qcom,ain-route = <3>; /* AMUX 8 */

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* Function constant */

		qcom,invert = <1>;

	};



	mpp@a400 { /* MPP 5 */

	};



	mpp@a500 { /* MPP 6 */

		/* channel 21 */

		qcom,mode = <4>;

		qcom,ain-route = <1>; /* AMUX 6 */

		qcom,master-en = <1>;

		qcom,src-sel = <0>; /* Function constant */

		qcom,invert = <1>;

	};

};

arch/arm/boot/dts/msmkrypton.dtsi

+108 −0
Original line number Diff line number Diff line
@@ -626,3 +626,111 @@ 


/include/ "msm-pmd9635.dtsi"

/include/ "msmkrypton-regulator.dtsi"



&pmd9635_vadc {

	chan@31 {

		label = "batt_id_therm";

		reg = <0x31>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <0>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@33 {

		label = "pa_therm0";

		reg = <0x33>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@34 {

		label = "pa_therm1";

		reg = <0x34>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@32 {

		label = "xo_therm";

		reg = <0x32>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@3c {

		label = "xo_therm_amux";

		reg = <0x3c>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@13 {

		label = "case_therm";

		reg = <0x13>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};



	chan@15 {

		label = "ambient_therm";

		reg = <0x15>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

	};

};



&pmd9635_adc_tm {

	/* Channel Node */

	chan@33 {

		label = "pa_therm0";

		reg = <0x33>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,btm-channel-number = <0x48>;

		qcom,thermal-node;

	};



	chan@34 {

		label = "pa_therm1";

		reg = <0x34>;

		qcom,decimation = <0>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,btm-channel-number = <0x68>;

		qcom,thermal-node;

	};

};