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

Commit 398225d3 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: Configure PMIC GPIO2 pin on sdxpoorwills"

parents f482d954 62a3ca5e
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ Optional properties:
		    1 : Forces a fresh measurement for calibration values at the same time
			measurement is taken.
- qcom,adc-full-scale-code: Full scale code with offset removed.
- pinctrl-names: should be "default" (see pinctrl binding [0]).
- pinctrl-0: a phandle pointing to the pin settings for the
  device (see pinctrl binding [0]).

[0]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

Client required property:
- qcom,<consumer name>-vadc : The phandle to the corresponding vadc device.
+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@
			interrupt-names = "eoc-int-en-set";
			qcom,adc-full-scale-code = <0x70e4>;
			qcom,adc-vdd-reference = <1875>;
			pinctrl-names = "default";
			pinctrl-0 = <&ambient_therm_default>;

			chan@6 {
				label = "die_temp";
+9 −0
Original line number Diff line number Diff line
@@ -921,3 +921,12 @@
		};
	};
};

&pmxpoorwills_gpios {
	ambient_therm {
		ambient_therm_default: ambient_therm_default {
			pins = "gpio2";
			bias-high-impedance;
		};
	};
};