Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07fb2060 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 855433dd aba9006c

arch/arm64/boot/dts/qcom/sdm855-sde.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -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 */