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

Commit 11b12594 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 nodes for SDM845" into msm-4.9

parents af4400dd 8ca295a1

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

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ 
			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";
@@ -191,6 +190,7 @@ 
			qcom,adc_tm-vadc = <&pm8998_vadc>;

			qcom,decimation = <0>;

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

			#thermal-sensor-cells = <1>;

		};

	};

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

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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};

};

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

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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};



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

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

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

		qcom,vadc-thermal-node;

	};

};