Merge "ARM: dts: msm: Add VADC and ADC_TM channel nodes"

	};

};

&pmd9635_mpps {

	mpp@a000 { /* MPP 1 */

	};

	mpp@a100 { /* MPP 2 */

	};

	mpp@a200 { /* MPP 3 */

	};

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

		status = "ok";

	};

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

		status = "ok";

	};

};

&pmd9635_vadc {

	chan@6 {

		label = "vbat_sns";

		reg = <6>;

		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@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@3c {

		label = "xo_therm_buf";

		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 {

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

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

		qcom,thermal-node;

	};

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

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

		qcom,thermal-node;

	};

};

&qnand_1 {

	status = "ok";

};