diff options
| author | Andy Gross <[email protected]> | 2018-11-14 09:31:54 -0800 |
|---|---|---|
| committer | Andy Gross <[email protected]> | 2018-11-14 09:31:54 -0800 |
| commit | 73e43d5cdf3e49d26cbf5b817501f213ed6e56cf (patch) | |
| tree | c6d02f08deb31209dc0ea4945ee3d0b65db620eb | |
| parent | 651022382c7f8da46cb4872a545ee1da6d097d2a (diff) | |
| parent | 9134586715e389fe90d9d28cb37a668f374d686a (diff) | |
Merge tag 'qcom-fixes-for-4.20-rc1' into arm64-for-4.21
Qualcomm ARM64 DT Fixes for 4.20-rc1
* Fix reserved gpio ranges for SDM845 and MSM8998
| -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"; }; |