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

Commit a0aa919c 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: Increase #iommu-cells to 2 for sdm845" into msm-4.9

parents d5bc1028 c4aaa90d

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm845.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
		reg = <0x15000000 0x80000>,

			<0x150c2000 0x20>;

		reg-names = "base", "tcu-base";

		#iommu-cells = <1>;

		#iommu-cells = <2>;

		qcom,skip-init;

		#global-interrupts = <1>;

		#size-cells = <1>;
@@ -339,6 +339,6 @@ 
		 * This SID belongs to PCIE. We can't use a fake SID for

		 * the apps_smmu device.

		 */

		iommus = <&apps_smmu 0x1c03>;

		iommus = <&apps_smmu 0x1c03 0>;

	};

};

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ 
		compatible = "qcom,msm-audio-ion";

		qcom,smmu-version = <2>;

		qcom,smmu-enabled;

		iommus = <&apps_smmu 0x1821>;

		iommus = <&apps_smmu 0x1821 0x0>;

	};



	qcom,msm-adsp-loader {

arch/arm64/boot/dts/qcom/sdm845-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <dt-bindings/clock/qcom,audio-ext-clk.h>



&msm_audio_ion {

	iommus = <&apps_smmu 0x1821>;

	iommus = <&apps_smmu 0x1821 0x0>;

	qcom,smmu-sid-mask = /bits/ 64 <0xf>;

};

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

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
		interrupts = <0 83 0>;

		interrupt-controller;

		#interrupt-cells = <1>;

		iommus = <&apps_smmu 0x880>, <&apps_smmu 0x888>,

			<&apps_smmu 0xc80>, <&apps_smmu 0xc88>;

		iommus = <&apps_smmu 0x880 0x0>, <&apps_smmu 0x888 0x0>,

			<&apps_smmu 0xc80 0x0>, <&apps_smmu 0xc88 0x0>;



		#address-cells = <1>;

		#size-cells = <0>;
@@ -260,14 +260,14 @@ 


		smmu_rot_unsec: qcom,smmu_rot_unsec_cb {

			compatible = "qcom,smmu_sde_rot_unsec";

			iommus = <&apps_smmu 0x1090>;

			iommus = <&apps_smmu 0x1090 0x0>;

			gdsc-mdss-supply = <&hlos1_vote_mmnoc_mmu_tbu_sf_gdsc>;

		};



		smmu_rot_sec: qcom,smmu_rot_sec_cb {

			status = "disabled";

			compatible = "qcom,smmu_sde_rot_sec";

			iommus = <&apps_smmu 0x1091>;

			iommus = <&apps_smmu 0x1091 0x0>;

			gdsc-mdss-supply = <&hlos1_vote_mmnoc_mmu_tbu_sf_gdsc>;

		};

	};

arch/arm64/boot/dts/qcom/sdm845-vidc.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_ns";

			iommus =

				<&apps_smmu 0x10a0>,

				<&apps_smmu 0x10a8>,

				<&apps_smmu 0x10b0>;

				<&apps_smmu 0x10a0 0x0>,

				<&apps_smmu 0x10a8 0x0>,

				<&apps_smmu 0x10b0 0x0>;

			buffer-types = <0xfff>;

			virtual-addr-pool = <0x70800000 0x6f800000>;

		};
@@ -108,10 +108,10 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_bitstream";

			iommus =

				<&apps_smmu 0x10a1>,

				<&apps_smmu 0x10a9>,

				<&apps_smmu 0x10a5>,

				<&apps_smmu 0x10ad>;

				<&apps_smmu 0x10a1 0x0>,

				<&apps_smmu 0x10a9 0x0>,

				<&apps_smmu 0x10a5 0x0>,

				<&apps_smmu 0x10ad 0x0>;

			buffer-types = <0x241>;

			virtual-addr-pool = <0x4b000000 0x25800000>;

			qcom,secure-context-bank;
@@ -121,8 +121,8 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_pixel";

			iommus =

				<&apps_smmu 0x10a3>,

				<&apps_smmu 0x10ab>;

				<&apps_smmu 0x10a3 0x0>,

				<&apps_smmu 0x10ab 0x0>;

			buffer-types = <0x106>;

			virtual-addr-pool = <0x25800000 0x25800000>;

			qcom,secure-context-bank;
@@ -132,9 +132,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_non_pixel";

			iommus =

				<&apps_smmu 0x10a4>,

				<&apps_smmu 0x10ac>,

				<&apps_smmu 0x10b4>;

				<&apps_smmu 0x10a4 0x0>,

				<&apps_smmu 0x10ac 0x0>,

				<&apps_smmu 0x10b4 0x0>;

			buffer-types = <0x480>;

			virtual-addr-pool = <0x1000000 0x24800000>;

			qcom,secure-context-bank;