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

Commit 410cf208 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 channel nodes on PM855B" into msm-4.14

parents c93299a6 37394e91

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

+15 −0
Original line number Diff line number Diff line
@@ -125,6 +125,21 @@ 
				label = "v_i_parallel_vbat_vdata";

				qcom,pre-scaling = <1 1>;

			};



			smb1390_therm {

				reg = <ADC_AMUX_THM2>;

				label = "smb1390_therm";

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

				qcom,pre-scaling = <1 1>;

			};



			smb1355_therm {

				reg = <ADC_AMUX_THM2_PU2>;

				label = "smb1355_therm";

				qcom,ratiometric;

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

				qcom,pre-scaling = <1 1>;

			};

		};



		pm855b_charger: qcom,qpnp-smb5 {

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

+0 −8
Original line number Diff line number Diff line
@@ -273,14 +273,6 @@ 
		qcom,pre-scaling = <1 1>;

	};



	smb_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "smb_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

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

+0 −8
Original line number Diff line number Diff line
@@ -277,14 +277,6 @@ 
		qcom,pre-scaling = <1 1>;

	};



	smb_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "smb_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ 
		qcom,pre-scaling = <1 1>;

	};



	smb_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "smb_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";