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

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

Merge "ARM: dts: msm: Add ion support for SDMSHRIKE"

parents 88a5fd4b 22227dd0
Loading
Loading
Loading
Loading
+55 −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-sys {
			reg = <ION_SYSTEM_HEAP_ID>;
			qcom,ion-heap-type = "MSM_SYSTEM";
		};

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

		qcom,ion-heap-user { /* USER CONTIG HEAP */
			reg = <ION_USER_CONTIG_HEAP_ID>;
			memory-region = <&user_contig_mem>;
			qcom,ion-heap-type = "DMA";
		};

		qcom,ion-heap-qsee { /* QSEECOM HEAP */
			reg = <ION_QSECOM_HEAP_ID>;
			memory-region = <&qseecom_mem>;
			qcom,ion-heap-type = "DMA";
		};

		qcom,ion-heap-qseeta { /* QSEECOM TA HEAP */
			reg = <ION_QSECOM_TA_HEAP_ID>;
			memory-region = <&qseecom_ta_mem>;
			qcom,ion-heap-type = "DMA";
		};

		qcom,ion-heap-spss { /* SPSS HEAP */
			reg = <ION_SPSS_HEAP_ID>;
			memory-region = <&sp_mem>;
			qcom,ion-heap-type = "HYP_CMA";
		};

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

		qcom,ion-heap-syssecure {
			reg = <ION_SECURE_HEAP_ID>;
			qcom,ion-heap-type = "SYSTEM_SECURE";
		};
	};
};
+6 −0
Original line number Diff line number Diff line
@@ -1433,6 +1433,8 @@
#include "sa8195-smp2p.dtsi"
#include "sa8195-gdsc.dtsi"
#include "msm-arm-smmu-sdmshrike.dtsi"
#include "sm8150-slpi-pinctrl.dtsi"
#include "sdmshrike-ion.dtsi"

&emac_gdsc {
	status = "ok";
@@ -1622,3 +1624,7 @@
	parent-supply = <&VDD_MMCX_LEVEL>;
	status = "ok";
};

&slpi_tlmm {
	status = "ok";
};