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

Commit 483eaf98 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Replace dma-ranges with new api"

parents 95426c65 63be4eea

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

+12 −6
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
		/* IOMMU Config */

		#address-cells = <1>;

		#size-cells = <1>;

		qcom,iommu-faults = "non-fatal";

		qcom,iommu-pagetables = "LLC";



		/* Supply */

		iris-ctl-supply = <&mvs0c_gdsc>;
@@ -77,7 +75,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_ns";

			iommus = <&apps_smmu 0x2100 0x0400>;

			dma-ranges = <0x25800000 0x25800000 0xba800000>;

			qcom,iommu-dma-addr-pool = <0x25800000 0xba800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetables = "LLC";

			buffer-types = <0xfff>;

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

		};
@@ -86,7 +86,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_non_pixel";

			iommus = <&apps_smmu 0x2104 0x0400>;

			dma-ranges = <0x01000000 0x01000000 0x24800000>;

			qcom,iommu-dma-addr-pool = <0x01000000 0x24800000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetables = "LLC";

			qcom,iommu-vmid = <0xB>; /*VMID_CP_NON_PIXEL*/

			buffer-types = <0x480>;

			virtual-addr-pool = <0x01000000 0x24800000>;
@@ -97,7 +99,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_bitstream";

			iommus = <&apps_smmu 0x2101 0x0404>;

			dma-ranges = <0x00500000 0x00500000 0xdfb00000>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetables = "LLC";

			qcom,iommu-vmid = <0x9>; /*VMID_CP_BITSTREAM*/

			buffer-types = <0x241>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;
@@ -108,7 +112,9 @@ 
			compatible = "qcom,msm-vidc,context-bank";

			label = "venus_sec_pixel";

			iommus = <&apps_smmu 0x2103 0x0400>;

			dma-ranges = <0x00500000 0x00500000 0xdfb00000>;

			qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;

			qcom,iommu-faults = "non-fatal";

			qcom,iommu-pagetables = "LLC";

			qcom,iommu-vmid = <0xA>; /*VMID_CP_PIXEL*/

			buffer-types = <0x106>;

			virtual-addr-pool = <0x00500000 0xdfb00000>;