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

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

Merge "ARM: dts: msm: Add secure display heap configuration for Bengal"

parents a1765399 15deaddf

qcom/bengal-ion.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
			qcom,ion-heap-type = "SYSTEM_SECURE";

		};



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

			reg = <10>;

			memory-region = <&secure_display_memory>;

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

		};



		qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */

			reg = <14>;

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

qcom/bengal.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -356,6 +356,14 @@ 
			reg = <0x0 0x5f800000 0x0 0x1e00000>;

		};



		secure_display_memory: secure_display_region {

			compatible = "shared-dma-pool";

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

			reusable;

			alignment = <0 0x400000>;

			size = <0 0x5c00000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";