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

Commit 815965aa 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: Update ADC node for pmxpoorwills"

parents 32e66368 58a0d5b4

Documentation/devicetree/bindings/hwmon/qpnp-adc-voltage.txt

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ Optional properties: 
  device (see pinctrl binding [0]).



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

- #thermal-sensor-cells : To register ADC sensors with of_thermal. Should be 1.

  See ./thermal.txt for a description.



Client required property:

- qcom,<consumer name>-vadc : The phandle to the corresponding vadc device.

Documentation/devicetree/bindings/thermal/qpnp-adc-tm.txt

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ Optional properties: 
- qcom,adc-tm-recalib-check: Add this property to check if recalibration required due to inaccuracy.

- hkadc_ldo-supply : Add this property if VADC needs to perform a Software Vote for the HKADC.

- hkadc_ok-supply : Add this property if the VADC needs to perform a Software vote for the HKADC VREG_OK.

- #thermal-sensor-cells : To register ADC sensors with of_thermal. Should be 1.

  See ./thermal.txt for a description.



Client required property:

- qcom,<consumer name>-adc_tm : The phandle to the corresponding adc_tm device.

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

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -97,6 +97,7 @@ 
			qcom,adc-vdd-reference = <1875>;

			pinctrl-names = "default";

			pinctrl-0 = <&ambient_therm_default>;

			#thermal-sensor-cells = <1>;



			chan@6 {

				label = "die_temp";