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

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

Merge "ARM: dts: msm: Add qseecom node for Lahaina"

parents 26bd15a4 7f1d897e

qcom/lahaina-ion.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -36,5 +36,24 @@ 
			memory-region = <&sp_mem>;

			qcom,ion-heap-type = "HYP_CMA";

		};



		qcom,ion-heap@26 { /* USER CONTIG HEAP */

			reg = <ION_USER_CONTIG_HEAP_ID>;

			memory-region = <&user_contig_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <ION_QSECOM_HEAP_ID>;

			memory-region = <&qseecom_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@19 { /* QSEECOM TA HEAP */

			reg = <ION_QSECOM_TA_HEAP_ID>;

			memory-region = <&qseecom_ta_mem>;

			qcom,ion-heap-type = "DMA";

		};



	};

};

qcom/lahaina.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -391,6 +391,30 @@ 
			size = <0x0 0x400000>;

		};



		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>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1400000>;

		};



		qseecom_ta_mem: qseecom_ta_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1000000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";
@@ -2628,6 +2652,21 @@ 
		hyplog-size-offset = <0x414>;

	};



	qcom_qseecom: qseecom@c1700000 {

		compatible = "qcom,qseecom";

		memory-region = <&qseecom_mem>;

		qcom,hlos-num-ce-hw-instances = <1>;

		qcom,hlos-ce-hw-instance = <0>;

		qcom,qsee-ce-hw-instance = <0>;

		qcom,disk-encrypt-pipe-pair = <2>;

		qcom,support-fde;

		qcom,no-clock-support;

		qcom,fde-key-size;

		qcom,appsbl-qseecom-support;

		qcom,commonlib64-loaded-by-uefi;

		qcom,qsee-reentrancy-support = <2>;

	};



	qcom,spcom {

		compatible = "qcom,spcom";