diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2023-03-28 15:32:04 -0700 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-03-28 15:32:04 -0700 |
| commit | 1554413537fdbc6fcb284f5419203d4945a4781d (patch) | |
| tree | 9ccdc8c01ba2390717e8b5b2154cf54a3c0711e1 /arch/arm64/boot/dts/qcom/sc7280.dtsi | |
| parent | 0514b376da09f9e4a6a4581112bcac063ee3ad9b (diff) | |
| parent | 1dc40551f206d20b7e46ea7dd538dcdd928451c6 (diff) | |
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/sc7280.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index e342dd073fd2..5e6f9f441f1a 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2138,6 +2138,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie1_clkreq_n>; + dma-coherent; + iommus = <&apps_smmu 0x1c80 0x1>; iommu-map = <0x0 &apps_smmu 0x1c80 0x1>, |