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

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

Merge "ARM: dts: msm: Add secure ion heap for sa8155-vm"

parents 06a288f7 ea2d92d1

arch/arm64/boot/dts/qcom/quin-vm-common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
		#clock-cells = <1>;

	};



	qcom,ion {

	msm_ion: qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm64/boot/dts/qcom/sa8155-vm.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -27,9 +27,16 @@ 
			reg = <0x0 0xa0000000 0x0 0x20000000>;

			label = "pmem_shared_mem";

		};



		secure_display_memory: secure_display_region { /* Secure UI */

			compatible = "shared-dma-pool";

			reusable;

			reg = <0x0 0xc0000000 0x0 0x14400000>;

		};

	};

};





&soc {

	hsi2s: qcom,hsi2s {

		compatible = "qcom,sa8155-hsi2s", "qcom,hsi2s";
@@ -691,3 +698,11 @@ 
&tlmm {

	dirconn-list = <37 216 1>;

};



&msm_ion {

	qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

		reg = <10>;

		memory-region = <&secure_display_memory>;

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

	};

};