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

Commit dd4a209c 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 Update SID to CB mappings for 8939"

parents 6325a17e 12497067

arch/arm/boot/dts/qcom/msm-iommu-v2.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
			qcom,secure-context;

			reg = <0x1e33000 0x1000>;

			interrupts = <0 70 0>, <0 70 0>;

			qcom,iommu-ctx-sids = <0x880 0x881 0x882 0x883 0x884>;

			qcom,iommu-ctx-sids = <0x885>;

			label = "venus_sec_pixel";

		};
@@ -150,7 +150,7 @@ 
			qcom,secure-context;

			reg = <0x1e34000 0x1000>;

			interrupts = <0 70 0>, <0 70 0>;

			qcom,iommu-ctx-sids = <0x885>;

			qcom,iommu-ctx-sids = <0x880 0x881 0x882 0x883 0x884>;

			label = "venus_sec_bitstream";

		};

arch/arm/boot/dts/qcom/msm8939-iommu.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ 


	qcom,iommu-ctx@1e23000 {

		interrupts = <0 54 0>;

		qcom,iommu-ctx-sids = <0x400 0x402>;

	};



	qcom,iommu-ctx@1e24000 {

		interrupts = <0 58 0>;

		qcom,iommu-ctx-sids = <0xc00 0xc01>;

		qcom,iommu-ctx-sids = <0xc00 0x2800>;

	};



	venus_ns: qcom,iommu-ctx@1e25000 {
@@ -41,7 +40,7 @@ 


	qcom,iommu-ctx@1e26000 {

		interrupts = <0 61 0>;

		qcom,iommu-ctx-sids = <0x2400 0x2402>;

		qcom,iommu-ctx-sids = <0x2400>;

	};



	qcom,iommu-ctx@1e27000 {
@@ -58,7 +57,7 @@ 


	qcom,iommu-ctx@1e32000 {

		interrupts = <0 110 0>, <0 110 0>;

		qcom,iommu-ctx-sids = <0x2800 0x2801>;

		qcom,iommu-ctx-sids = <0xc01 0x2801>;

	};



	venus_sec_pixel: qcom,iommu-ctx@1e33000 {