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

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

Merge "ARM: dts: msm: Add secure carveout ION heaps for Shima"

parents 77e0aebe f3184ed5

qcom/shima-ion.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ 
			qcom,ion-heap-type = "SYSTEM_SECURE";

		};



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

			reg = <ION_SECURE_CARVEOUT_HEAP_ID>;

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

			cdsp {

					memory-region = <&cdsp_secure_heap_mem>;

					token = <0x20000000>;

			};

		};



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

			reg = <ION_SECURE_DISPLAY_HEAP_ID>;

			memory-region = <&secure_display_memory>;

qcom/shima.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -2672,6 +2672,11 @@ 
		mbox-names = "cdsp-pil";

	};



	qcom,msm-cdsp-loader {

		compatible = "qcom,cdsp-loader";

		qcom,proc-img-to-load = "cdsp";

	};



	qcom,msm-adsprpc-mem {

		compatible = "qcom,msm-adsprpc-mem-region";

		memory-region = <&adsp_mem>;
@@ -2721,6 +2726,8 @@ 
		qcom,fastrpc-adsp-audio-pdr;

		qcom,fastrpc-adsp-sensors-pdr;

		qcom,rpc-latency-us = <235>;

		qcom,fastrpc-gids = <2908>;

		qcom,qos-cores = <0 1 2 3>;



		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";