diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 12:52:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 12:52:08 -0700 |
| commit | 38c2f3826d8e9f474d0a21bd9c3cf2dc4166dc62 (patch) | |
| tree | 43703410150a57a378cbbc1e4c55ce42ca864237 /Documentation/devicetree | |
| parent | be058ba65d9e43f40d31d9b16b99627f0a20de1b (diff) | |
| parent | 6ef7c11b31a57e43062da15a36fac54fcb97b533 (diff) | |
Merge tag 'qcom-arm64-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into arm/dt
Qualcomm ARM64 Updates for v5.2
* Add gpio ranges for Qualcomm platforms
* Fix MSM8998 BLSP2 I2C5 address
* Add MSM8998 UFS nodes and associated information
* Add SDM845 interconnect header and usage
* Add ADSP and CDSP PAS, RMTFS memory, and UFS phy reset on SDM845
* Update reserved memory map on SDM845
* Add QCS404 spmi regulators, ethernet, bluetooth, and uart3
* Remove remotely-controlled property as default for BAM on QCS404
* Add spmi regulators on PMS405
* Fixup QCS404 l3 voltages and regulator supply names
* Fixup thermal trip names on Qualcomm platforms
* Add thermal sensors on Qualcomm platforms
* Remove invalid efficiency property on MSM8998
* Change QCS404-evb compatible to help distinguish platforms
* Add rpmhd header file and convert to use definitions on SDM845
* Add interconnect header file on SDM845
* Add PMS405 ADC binding
* tag 'qcom-arm64-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (38 commits)
arm64: dts: sdm845: Introduce ADSP and CDSP PAS nodes
arm64: dts: qcom: sdm845: Define rmtfs memory
arm64: dts: qcom: sdm845: Update reserved memory map
arm64: dts: sdm845: Add UFS PHY reset
arm64: dts: qcom: msm8998: Fix blsp2_i2c5 address
arm64: dts: qcom: qcs404-evb: Change the compatible to distinguish platforms
arm64: dts: qcom: pmi8998: add gpio-ranges
arm64: dts: qcom: pmi8994: add gpio-ranges
arm64: dts: qcom: pm8998: add gpio-ranges
arm64: dts: qcom: pm8005: add gpio-ranges
arm64: dts: msm8998: Add UFS phy reset
arm64: dts: msm8916: thermal: Convert camera trip type to hot
arm64: dts: msm8996: thermal: Make trip names consistent
arm64: dts: msm8916: thermal: Make trip names consistent
arm64: dts: msm8998: thermal: Make trip names consistent
arm64: dts: sdm845: thermal: Add temperature sensors near major peripherals
arm64: dts: msm8998: thermal: Add temperature sensors near major peripherals
arm64: dts: msm8998: thermal: GPU has two sensors, add the second
arm64: dts: msm8998: thermal: Fix the gpu sensor number
arm64: dts: msm8998: thermal: Fix the cpu sensor numbers
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt index c81993f8d8c3..c8787688122a 100644 --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.txt @@ -13,6 +13,7 @@ VADC node: Definition: Should contain "qcom,spmi-vadc". Should contain "qcom,spmi-adc5" for PMIC5 ADC driver. Should contain "qcom,spmi-adc-rev2" for PMIC rev2 ADC driver. + Should contain "qcom,pms405-adc" for PMS405 PMIC - reg: Usage: required diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt index 5111e9130bc3..991e21ee7b44 100644 --- a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt +++ b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt @@ -11,6 +11,7 @@ Required properties: the appropriate jedec string: "qcom,msm8994-ufshc", "qcom,ufshc", "jedec,ufs-2.0" "qcom,msm8996-ufshc", "qcom,ufshc", "jedec,ufs-2.0" + "qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0" "qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0" - interrupts : <interrupt mapping for UFS host controller IRQ> - reg : <registers mapping> |