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

Commit e6fc5c6d 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: move the VADC nodes to the correct SID"

parents b9988b2e 31d92990

arch/arm/boot/dts/qcom/msm-pmd9635.dtsi

+61 −61
Original line number Original line Diff line number Diff line
@@ -135,6 +135,67 @@ 
				interrupts = <0x0 0x61 0x1>;

				interrupts = <0x0 0x61 0x1>;

			};

			};

		};

		};



		pmd9635_vadc: vadc@3100 {

			compatible = "qcom,qpnp-vadc";

			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

			interrupt-names = "eoc-int-en-set";

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

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

			qcom,vadc-poll-eoc;



			chan@8 {

				label = "die_temp";

				reg = <8>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <3>;

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

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

			};



			chan@9 {

				label = "ref_625mv";

				reg = <9>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

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

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

			};



			chan@a {

				label = "ref_1250v";

				reg = <0xa>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

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

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

			};

		};



		pmd9635_adc_tm: vadc@3400 {

			compatible = "qcom,qpnp-adc-tm";

			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

				     <0x0 0x34 0x4>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";

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

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

			qcom,adc_tm-vadc = <&pmd9635_vadc>;

		};

	};

	};





	qcom,pmd9635@1 {

	qcom,pmd9635@1 {
@@ -354,66 +415,5 @@ 
			reg = <0x4f00 0x100>;

			reg = <0x4f00 0x100>;

			status = "disabled";

			status = "disabled";

		};

		};



		pmd9635_vadc: vadc@3100 {

			compatible = "qcom,qpnp-vadc";

			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x0 0x31 0x0>;

			interrupt-names = "eoc-int-en-set";

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

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

			qcom,vadc-poll-eoc;



			chan@8 {

				label = "die_temp";

				reg = <8>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <3>;

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

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

			};



			chan@9 {

				label = "ref_625mv";

				reg = <9>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

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

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

			};



			chan@a {

				label = "ref_1250v";

				reg = <0xa>;

				qcom,decimation = <0>;

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

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;

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

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

			};

		};



		pmd9635_adc_tm: vadc@3400 {

			compatible = "qcom,qpnp-adc-tm";

			reg = <0x3400 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts =	<0x0 0x34 0x0>,

					<0x0 0x34 0x3>,

				     <0x0 0x34 0x4>;

			interrupt-names =	"eoc-int-en-set",

						"high-thr-en-set",

						"low-thr-en-set";

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

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

			qcom,adc_tm-vadc = <&pmd9635_vadc>;

		};

	};

	};

};
 
};