Merge "ARM: dts: msm: fix display IOMMU context bank SID masks" into msm-4.14

7 years ago · 07fb206083
parent 855433dd3c aba9006c39
commit 07fb206083
1 changed files with 2 additions and 4 deletions
--- a/arch/arm64/boot/dts/qcom/sdm855-sde.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm855-sde.dtsi
@ -38,8 +38,7 @@
 		interrupts = <0 83 0>;
 		interrupt-controller;
 		#interrupt-cells = <1>;
-		iommus = <&apps_smmu 0x800 0x20>,
-			<&apps_smmu 0xc00 0x20>;
+		iommus = <&apps_smmu 0x800 0x420>;

 		#address-cells = <1>;
 		#size-cells = <0>;
@ -274,8 +273,7 @@

 		smmu_sde_sec: qcom,smmu_sde_sec_cb {
 			compatible = "qcom,smmu_sde_sec";
-			iommus = <&apps_smmu 0x801 0x20>,
-			       <&apps_smmu 0xc01 0x20>;
+			iommus = <&apps_smmu 0x801 0x420>;
 		};

 		/* data and reg bus scale settings */