diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-03 22:04:14 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-03 22:04:14 +0100 |
| commit | acfbaa5d3bd6e8f7d3b40f2f6e87399037c78333 (patch) | |
| tree | 7de403ce749f6cf313eaae290e628b6570d57e69 /Documentation | |
| parent | ARM: mmp2: DT: be compatible with mrvl,mmp2 (diff) | |
| parent | arm64: dts: qcom: msm8998: Fix compatible of scm node (diff) | |
| download | linux-acfbaa5d3bd6e8f7d3b40f2f6e87399037c78333.tar.xz linux-acfbaa5d3bd6e8f7d3b40f2f6e87399037c78333.zip | |
Merge tag 'qcom-arm64-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Qualcomm ARM64 Updates for v4.21
* Add QCS404 base platform and nodes
* Add QCS404 EVB boards
* Add external SD and dependencies for MSM8998-mtp
* Add default scm compatible for MSM8998
* Fix XO clk name on MSM8998
* Add prng-ee nodes for SDM845 and MSM8996
* Add ADC die temp node for pm8998
* Fix documentation on QCOM ADC sample
* tag 'qcom-arm64-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (34 commits)
arm64: dts: qcom: msm8998: Fix compatible of scm node
arm64: dts: qcom: msm8998: Add SDC2 control pins
arm64: dts: qcom: msm8998-mtp: Add external SD
arm64: dts: qcom: msm8998: Add SDCC2
arm64: dts: qcom: msm8998: correct xo clock name
arm64: dts: qcom: pms405: Add pon and pwrkey nodes
arm64: dts: qcom: qcs404: Use BAM DMA for serial uart2
arm64: dts: qcom: qcs404: Add BAM DMA node
arm64: dts: qcom: qcs404: add prng-ee node
arm64: dts: qcom: qcs404: Add remoteproc nodes
arm64: dts: qcom: qcs404: Add scm firmware node
arm64: dts: qcom: pms405: add gpios
arm64: dts: qcom: pms405: add rtc node
arm64: dts: qcom: qcs404: add spmi node
arm64: dts: qcom: pms405: add spmi node
arm64: dts: qcom: qcs404: Add sdcc1 node
arm64: dts: qcom: qcs404: Add TLMM pinctrl node
arm64: dts: qcom: qcs404: add smp2p nodes
arm64: dts: qcom: qcs404: Add PMS405 RPM regulators
arm64: dts: qcom: qcs404: Add RPM GLINK related nodes
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt index b3c86f4ac7cd..c81993f8d8c3 100644 --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt @@ -140,6 +140,10 @@ VADC_GND_REF and VADC_VDD_VADC. Example: +#include <dt-bindings/iio/qcom,spmi-vadc.h> +#include <linux/irq.h> +/* ... */ + /* VADC node */ pmic_vadc: vadc@3100 { compatible = "qcom,spmi-vadc"; @@ -151,7 +155,7 @@ Example: io-channel-ranges; /* Channel node */ - usb_id_nopull { + adc-chan@VADC_LR_MUX10_USB_ID { reg = <VADC_LR_MUX10_USB_ID>; qcom,decimation = <512>; qcom,ratiometric; |