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

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

Merge "ARM: dts: msm: Add ion user contiguous heap for kona"

parents a92fa396 45f94534
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@
			qcom,ion-heap-type = "SYSTEM_SECURE";
		};

		qcom,ion-heap@26 { /* USER CONTIG HEAP */
			reg = <26>;
			memory-region = <&user_contig_mem>;
			qcom,ion-heap-type = "DMA";
		};

		qcom,ion-heap@27 { /* QSEECOM HEAP */
			reg = <27>;
			memory-region = <&qseecom_mem>;
+8 −0
Original line number Diff line number Diff line
@@ -628,6 +628,14 @@
			size = <0x0 0xc00000>;
		};

		user_contig_mem: user_contig_region {
			compatible = "shared-dma-pool";
			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
			reusable;
			alignment = <0x0 0x400000>;
			size = <0x0 0x1000000>;
		};

		qseecom_mem: qseecom_region {
			compatible = "shared-dma-pool";
			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;