diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2023-03-29 01:32:04 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-03-29 01:32:04 +0300 |
| commit | 1554413537fdbc6fcb284f5419203d4945a4781d (patch) | |
| tree | 9ccdc8c01ba2390717e8b5b2154cf54a3c0711e1 /arch/arm64/boot/dts/qcom/sm8150.dtsi | |
| parent | 0514b376da09f9e4a6a4581112bcac063ee3ad9b (diff) | |
| parent | 1dc40551f206d20b7e46ea7dd538dcdd928451c6 (diff) | |
| download | linux-1554413537fdbc6fcb284f5419203d4945a4781d.tar.xz | |
Merge branch 'arm64-fixes-for-6.3' into arm64-for-6.4
Merge the arm64-fixes-for-6.3 branch to avoid merge conflicts with
changes for v6.4.
Diffstat (limited to 'arch/arm64/boot/dts/qcom/sm8150.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 573f6bba6f39..9491be4a6bf0 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -1850,7 +1850,7 @@ "slave_q2a", "tbu"; - iommus = <&apps_smmu 0x1d80 0x7f>; + iommus = <&apps_smmu 0x1d80 0x3f>; iommu-map = <0x0 &apps_smmu 0x1d80 0x1>, <0x100 &apps_smmu 0x1d81 0x1>; @@ -1949,7 +1949,7 @@ assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>; assigned-clock-rates = <19200000>; - iommus = <&apps_smmu 0x1e00 0x7f>; + iommus = <&apps_smmu 0x1e00 0x3f>; iommu-map = <0x0 &apps_smmu 0x1e00 0x1>, <0x100 &apps_smmu 0x1e01 0x1>; |