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

Commit a55aa160 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: Update VADC channels on SDM845 platforms" into msm-4.9

parents 4589ef9d 0fbfc823

arch/arm64/boot/dts/qcom/pm8998.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
			interrupt-names = "eoc-int-en-set";

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

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

			#thermal-sensor-cells = <1>;



			chan@6 {

				label = "die_temp";

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+22 −36
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ aliases { 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4d {
@@ -278,6 +279,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4f {
@@ -289,6 +291,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@51 {
@@ -300,6 +303,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};

};
@@ -313,48 +317,30 @@ aliases { 
		qcom,hw-settle-time = <0>;

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

	};

};



	chan@4d {

		label = "msm_therm";

		reg = <0x4d>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

&thermal_zones {

	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4c>;

	};



	chan@51 {

		label = "quiet_therm";

		reg = <0x51>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

	msm-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4d>;

	};



	chan@4c {

		label = "xo_therm";

		reg = <0x4c>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

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

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

		qcom,thermal-node;

	pa-therm1-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4f>;

	};



	chan@4f {

		label = "pa_therm1";

		reg = <0x4f>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x51>;

	};

};

arch/arm64/boot/dts/qcom/sdm845-mtp.dtsi

+22 −36
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ aliases { 
		qcom,scale-function = <4>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4d {
@@ -256,6 +257,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@4f {
@@ -267,6 +269,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};



	chan@51 {
@@ -278,6 +281,7 @@ aliases { 
		qcom,scale-function = <2>;

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

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

		qcom,vadc-thermal-node;

	};

};
@@ -291,48 +295,30 @@ aliases { 
		qcom,hw-settle-time = <0>;

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

	};

};



	chan@4d {

		label = "msm_therm";

		reg = <0x4d>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

&thermal_zones {

	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4c>;

	};



	chan@51 {

		label = "quiet_therm";

		reg = <0x51>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

	msm-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4d>;

	};



	chan@4c {

		label = "xo_therm";

		reg = <0x4c>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

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

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

		qcom,thermal-node;

	pa-therm1-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x4f>;

	};



	chan@4f {

		label = "pa_therm1";

		reg = <0x4f>;

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

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

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

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

		qcom,thermal-node;

	quiet-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm8998_vadc 0x51>;

	};

};