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

Commit 471a4ac3 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 phandle to read PMIC rev-id"

parents d713b350 8e7dcb0e
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
		#address-cells = <1>;
		#size-cells = <1>;

		qcom,revid@100 {
		pm8110_revid: qcom,revid@100 {
			compatible = "qcom,qpnp-revid";
			reg = <0x100 0x100>;
		};
@@ -223,6 +223,7 @@
			qcom,adc-bit-resolution = <15>;
			qcom,adc-vdd-reference = <1800>;
			qcom,vadc-poll-eoc;
			qcom,pmic-revid = <&pm8110_revid>;

			chan@8 {
				label = "die_temp";
@@ -269,6 +270,7 @@
			qcom,adc-vdd-reference = <1800>;
			qcom,iadc-vadc = <&pm8110_vadc>;
			qcom,iadc-poll-eoc;
			qcom,pmic-revid = <&pm8110_revid>;

			chan@0 {
				label = "internal_rsense";
+2 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@
			qcom,adc-bit-resolution = <15>;
			qcom,adc-vdd-reference = <1800>;
			qcom,vadc-poll-eoc;
			qcom,pmic-revid = <&pm8226_revid>;

			chan@8 {
				label = "die_temp";
@@ -427,6 +428,7 @@
			qcom,adc-vdd-reference = <1800>;
			qcom,iadc-vadc = <&pm8226_vadc>;
			qcom,iadc-poll-eoc;
			qcom,pmic-revid = <&pm8226_revid>;

			chan@0 {
				label = "internal_rsense";
+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
		reg = <0x900 0x100>;
	};

	qcom,revid@100 {
	pm8941_revid: qcom,revid@100 {
		compatible = "qcom,qpnp-revid";
		reg = <0x100 0x100>;
	};
@@ -576,6 +576,7 @@
		qcom,adc-bit-resolution = <15>;
		qcom,adc-vdd-reference = <1800>;
		qcom,vadc-poll-eoc;
		qcom,pmic-revid = <&pm8941_revid>;

		chan@0 {
			label = "usb_in";
@@ -820,6 +821,7 @@
		qcom,adc-vdd-reference = <1800>;
		qcom,iadc-vadc = <&pm8941_vadc>;
		qcom,iadc-poll-eoc;
		qcom,pmic-revid = <&pm8941_revid>;

		chan@0 {
			label = "internal_rsense";