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

Commit 5ce47338 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 b15e9e5a 77cb5949

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

+5 −0
Original line number Diff line number Diff line
@@ -240,6 +240,11 @@ 


	mpp@a300 { /* MPP 4 */

		/* VBATT */

		qcom,mode = <4>; /* AIN input */

		qcom,invert = <1>; /* Enable MPP */

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

		qcom,master-en = <1>;

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

	};



	mpp@a400 { /* MPP 5 */

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

+5 −0
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ 


	mpp@a300 { /* MPP 4 */

		/* VBATT */

		qcom,mode = <4>; /* AIN input */

		qcom,invert = <1>; /* Enable MPP */

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

		qcom,master-en = <1>;

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

	};



	mpp@a400 { /* MPP 5 */

arch/arm/boot/dts/msmsamarium.dtsi

+189 −0
Original line number Diff line number Diff line
@@ -1860,3 +1860,192 @@ 
/include/ "msm-pma8084.dtsi"

/include/ "msmsamarium-regulator.dtsi"

/include/ "msmsamarium-mdss.dtsi"



&pma8084_vadc {

	chan@5 {

		label = "vcoin";

		reg = <5>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

	};



	chan@7 {

		label = "vph_pwr";

		reg = <7>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

	};



	chan@23 {

		label = "mpp4_vbatt";

		reg = <0x23>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

	};



	chan@39 {

		label = "usb_id_nopull";

		reg = <0x39>;

		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@73 {

		label = "msm_therm";

		reg = <0x73>;

		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@74 {

		label = "pa_therm0";

		reg = <0x74>;

		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@75 {

		label = "pa_therm1";

		reg = <0x75>;

		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@77 {

		label = "batt_id";

		reg = <0x77>;

		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@78 {

		label = "batt_therm";

		reg = <0x78>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <1>;

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

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

	};



	chan@7c {

		label = "xo_therm_buf";

		reg = <0x7c>;

		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>;

	};

};



&pma8084_adc_tm {

	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 = <3>;

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

	};



	chan@78 {

		label = "batt_therm";

		reg = <0x78>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <1>;

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

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

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

	};



	chan@23 {

		label = "mpp4_vbatt";

		reg = <0x23>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

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

	};



	chan@73 {

		label = "msm_therm";

		reg = <0x73>;

		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 = <0x78>;

		qcom,thermal-node;

	};



	chan@74 {

		label = "pa_therm0";

		reg = <0x74>;

		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 = <0x80>;

		qcom,thermal-node;

	};



	chan@75 {

		label = "pa_therm1";

		reg = <0x75>;

		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 = <0x88>;

		qcom,thermal-node;

	};

};