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

Commit b49f1a40 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 pm8953"

parents e061045e 059b72a9

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

+91 −1
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ 
			mpp@a100 {

				reg = <0xa100 0x100>;

				qcom,pin-num = <2>;

				/* MPP2 - PA_THERM config */

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

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

				qcom,ain-route = <1>; /* AMUX 6 */

				qcom,master-en = <1>;

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

			};



			mpp@a200 {
@@ -93,6 +99,12 @@ 
			mpp@a300 {

				reg = <0xa300 0x100>;

				qcom,pin-num = <4>;

				/* MPP4 - CASE_THERM config */

				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 */

			};

		};
@@ -165,6 +177,28 @@ 
			qcom,adc-vdd-reference = <1800>;

			qcom,vadc-poll-eoc;



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

				label = "die_temp";

				reg = <8>;
@@ -208,6 +242,63 @@ 
				qcom,hw-settle-time = <0>;

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

			};



			chan@36 {

				label = "pa_therm0";

				reg = <0x36>;

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

				label = "pa_therm1";

				reg = <0x11>;

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

				label = "xo_therm";

				reg = <0x32>;

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

				qcom,vadc-thermal-node;

			};



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

				qcom,vadc-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>;

			};

		};



		pm8953_adc_tm: vadc@3400 {
@@ -224,7 +315,6 @@ 
			qcom,adc-bit-resolution = <15>;

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

			qcom,adc_tm-vadc = <&pm8953_vadc>;



		};



		pm8953_rtc: qcom,pm8953_rtc {