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

Commit 360d1867 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: mdm: Add VADC channels for mdmcalifornium"

parents 513bf84c 0d39b7e9

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-cdp.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@53 {
@@ -118,6 +119,43 @@ 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		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,vadc-thermal-node;

	};



	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		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,vadc-thermal-node;

	};



	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		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,vadc-thermal-node;

	};

};

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-mtp.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@53 {
@@ -140,5 +141,42 @@ 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		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,vadc-thermal-node;

	};



	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		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,vadc-thermal-node;

	};



	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		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,vadc-thermal-node;

	};

};