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

Commit cec0f232 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: Add VADC and ADC_TM channels for plutonium"

parents 7281a115 55b0d822

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

+12 −0
Original line number Diff line number Diff line
@@ -111,6 +111,18 @@ 
				qcom,pin-num = <4>;

			};

		};



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

		};

	};



	qcom,pmplutonium@3 {

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

+61 −0
Original line number Diff line number Diff line
@@ -191,6 +191,67 @@ 
				qcom,pin-num = <8>;

			};

		};



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

			};

		};



		pmplutonium_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 = <&pmplutonium_vadc>;

		};

	};



	qcom,pmplutonium@1 {

arch/arm/boot/dts/qcom/msmplutonium.dtsi

+170 −0
Original line number Diff line number Diff line
@@ -979,3 +979,173 @@ 
#include "msmplutonium-ion.dtsi"

#include "msmplutonium-iommu.dtsi"

#include "msmplutonium-iommu-domains.dtsi"



&pmplutonium_vadc {

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

		label = "msm_therm";

		reg = <0x73>;

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

		label = "emmc_therm";

		reg = <0x74>;

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

		label = "pa_therm0";

		reg = <0x75>;

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

		label = "pa_therm1";

		reg = <0x77>;

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

		label = "quiet_therm";

		reg = <0x78>;

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

	};

};



&pmplutonium_adc_tm {

	chan@73 {

		label = "msm_therm";

		reg = <0x73>;

		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,btm-channel-number = <0x48>;

		qcom,thermal-node;

	};



	chan@74 {

		label = "emmc_therm";

		reg = <0x74>;

		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,btm-channel-number = <0x68>;

		qcom,thermal-node;

	};



	chan@75 {

		label = "pa_therm0";

		reg = <0x75>;

		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,btm-channel-number = <0x70>;

		qcom,thermal-node;

	};



	chan@77 {

		label = "pa_therm1";

		reg = <0x77>;

		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,btm-channel-number = <0x78>;

		qcom,thermal-node;

	};



	chan@78 {

		label = "quiet_therm";

		reg = <0x78>;

		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,btm-channel-number = <0x80>;

		qcom,thermal-node;

	};

};



&pmiplutonium_vadc {

	chan@0 {

		label = "usbin";

		reg = <0>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

	};



	chan@1 {

		label = "dcin";

		reg = <1>;

		qcom,decimation = <0>;

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

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

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

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

	};

};