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

Commit 7ebb123c 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: Support VADC_HC for mdmcalifornium"

parents 58b108b0 8c526e0b

arch/arm/boot/dts/qcom/mdmcalifornium-cdp.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -74,3 +74,38 @@ 
&usb3 {

	vbus_dwc3-supply = <&smb1351_otg_supply>;

};



&pmdcalifornium_vadc {

	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		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@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

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

	};



	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

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

	};

};

arch/arm/boot/dts/qcom/mdmcalifornium-mtp.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -80,3 +80,38 @@ 
	vbus_dwc3-supply = <&smb1351_otg_supply>;

	cpe-gpio = <&tlmm_pinmux 87 0>;

};



&pmdcalifornium_vadc {

	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		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@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

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

	};



	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

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

	};

};

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

+47 −0
Original line number Diff line number Diff line
@@ -110,6 +110,53 @@ 
				status = "disabled";

			};

		};



		pmdcalifornium_vadc: vadc@3100 {

			compatible = "qcom,qpnp-vadc-hc";

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



			chan@6 {

				label = "die_temp";

				reg = <6>;

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

				qcom,cal-val = <0>;

			};



			chan@0 {

				label = "ref_gnd";

				reg = <0>;

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

				qcom,cal-val = <0>;

			};



			chan@1 {

				label = "ref_1250v";

				reg = <1>;

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

				qcom,cal-val = <0>;

			};

		};

	};



	qcom,pmdcalifornium@1 {