Merge "ARM: dts: msm: Add secure_buffer and qcom,scm device on SM8150" (e06eed65) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/sm8150-ion.dtsi

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		#include <dt-bindings/arm/msm/msm_ion_ids.h>

		&soc {
		qcom,ion {
		compatible = "qcom,msm-ion";
		#address-cells = <1>;
		#size-cells = <0>;

		system_heap: qcom,ion-heap@25 {
		reg = <ION_SYSTEM_HEAP_ID>;
		qcom,ion-heap-type = "SYSTEM";
		};

		qcom,ion-heap@22 { /* ADSP HEAP */
		reg = <ION_ADSP_HEAP_ID>;
		memory-region = <&adsp_mem>;
		qcom,ion-heap-type = "DMA";
		};

		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,ion-heap@13 { /* SPSS HEAP */
		reg = <ION_SPSS_HEAP_ID>;
		memory-region = <&sp_mem>;
		qcom,ion-heap-type = "HYP_CMA";
		};

		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */
		reg = <ION_SECURE_DISPLAY_HEAP_ID>;
		memory-region = <&secure_display_memory>;
		qcom,ion-heap-type = "HYP_CMA";
		};

		qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */
		reg = <ION_SECURE_CARVEOUT_HEAP_ID>;
		qcom,ion-heap-type = "SECURE_CARVEOUT";
		cdsp {
		memory-region = <&cdsp_sec_mem>;
		token = <0x20000000>;
		};
		};

		qcom,ion-heap@9 {
		reg = <ION_SECURE_HEAP_ID>;
		qcom,ion-heap-type = "SYSTEM_SECURE";
		};
		};
		};

+11 −0

Original line number	Diff line number	Diff line
		@@ -552,6 +552,10 @@
		compatible = "simple-bus";
		};

		qcom-secure-buffer {
		compatible = "qcom,secure-buffer";
		};

		clocks {
		xo_board: xo-board {
		compatible = "fixed-clock";
		@@ -749,6 +753,13 @@
		};
		};

		&firmware {
		scm {
		compatible = "qcom,scm";
		};
		};

		#include "sm8150-ion.dtsi"
		#include "sm8150-pinctrl.dtsi"
		#include "sm8150-regulator.dtsi"
		#include "sm8150-pm.dtsi"