diff options
| author | Olof Johansson <olof@lixom.net> | 2018-11-12 10:14:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-12 10:14:45 -0800 |
| commit | 2e904398119d64a58ac26cb9a3f2c178a132368f (patch) | |
| tree | b2a797ca41cbeb134d2961800066eb60c8bd3a4e /arch/arm64 | |
| parent | a89f84a56ec95fd66b839bf9c545f8a59a4ffcd5 (diff) | |
| parent | 9134586715e389fe90d9d28cb37a668f374d686a (diff) | |
| download | linux-2e904398119d64a58ac26cb9a3f2c178a132368f.tar.bz2 | |
Merge tag 'qcom-fixes-for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
Qualcomm ARM64 DT Fixes for 4.20-rc1
* Fix reserved gpio ranges for SDM845 and MSM8998
* tag 'qcom-fixes-for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: dts: qcom: msm8998: Reserve gpio ranges on MTP
arm64: dts: sdm845-mtp: Reserve reserved gpios
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi index b4276da1fb0d..11fd1fe8bdb5 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi @@ -241,3 +241,7 @@ }; }; }; + +&tlmm { + gpio-reserved-ranges = <0 4>, <81 4>; +}; diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index eedfaf8922e2..d667eee4e6d0 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -352,6 +352,10 @@ status = "okay"; }; +&tlmm { + gpio-reserved-ranges = <0 4>, <81 4>; +}; + &uart9 { status = "okay"; }; |