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

Commit b639b04b 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: Add support for new Qseecom_ta ion heap for msm8937"

parents 7ac52642 011276ef
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -33,5 +33,11 @@
			memory-region = <&qseecom_mem>;
			qcom,ion-heap-type = "DMA";
		};

		qcom,ion-heap@19 { /* QSEECOM TA HEAP */
			reg = <19>;
			memory-region = <&qseecom_ta_mem>;
			qcom,ion-heap-type = "DMA";
		};
	};
};
+8 −0
Original line number Diff line number Diff line
@@ -105,6 +105,14 @@
			size = <0 0x1000000>;
		};

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

		adsp_mem: adsp_region@0 {
			compatible = "shared-dma-pool";
			reusable;