diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-26 00:33:36 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-26 00:33:36 +0300 |
| commit | 2a000443701bb893ebb369ad8dae836cd78d7116 (patch) | |
| tree | 5ed924adab3c9edc02bd5f15c7a15e29cf51c1ab /arch/arm/boot/dts/qcom-pm8941.dtsi | |
| parent | efe5322843525cd8e6538a4b8ea561168e1e7c65 (diff) | |
| parent | 90ce62659994b87723ec6ba26815f9634c18e449 (diff) | |
| download | linux-2a000443701bb893ebb369ad8dae836cd78d7116.tar.xz | |
Merge tag 'qcom-dts-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Qualcomm Device Tree Changes for v4.18
* APQ8064 fixes for irq translations and pci address translation
* Fix RPM clock controller compatible on MSM8660
* Add TZ and SMEM reserved regions on IPQ4019
* Add vadc nodes for PM8941
* Disable i2c by default at top level APQ8064 dtsi
* tag 'qcom-dts-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: qcom-apq8064: use correct pci address for address translation
ARM: dts: qcom-apq8064: fix gic_irq_domain_translate warnings
ARM: dts: Fix the RPM clock controller compatible string
ARM: dts: ipq4019: Add TZ and SMEM reserved regions
ARM: dts: qcom: pm8941: Add vadc nodes needed to estimate an ocv
ARM: dts: qcom-apq8064: disable i2c by default at soc dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/qcom-pm8941.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/qcom-pm8941.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom-pm8941.dtsi b/arch/arm/boot/dts/qcom-pm8941.dtsi index 1d5ef55c7ee5..2515c5c217ac 100644 --- a/arch/arm/boot/dts/qcom-pm8941.dtsi +++ b/arch/arm/boot/dts/qcom-pm8941.dtsi @@ -139,6 +139,9 @@ #size-cells = <0>; #io-channel-cells = <1>; + bat_temp { + reg = <VADC_LR_MUX1_BAT_THERM>; + }; die_temp { reg = <VADC_DIE_TEMP>; }; @@ -154,6 +157,9 @@ ref_vdd { reg = <VADC_VDD_VADC>; }; + vbat_sns { + reg = <VADC_VBAT_SNS>; + }; }; pm8941_iadc: iadc@3600 { |