Merge "ARM: dts: msm: Add initial ION heaps for holi" (23f850ea) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/holi-ion.dtsi

0 → 100644

+19 −0

Original line number	Original line	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";
			};

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

qcom/holi.dtsi

+102 −0

Original line number	Original line	Diff line number	Diff line
	@@ -192,6 +192,107 @@
	};		};
	};		};

			reserved-memory {
			#address-cells = <2>;
			#size-cells = <2>;
			ranges;

			hyp_mem: hyp@80000000 {
			no-map;
			reg = <0x0 0x80000000 0x0 0x600000>;
			};

			xbl_aop_mem: xbl_aop_mem@80700000 {
			no-map;
			reg = <0x0 0x80700000 0x0 0x160000>;
			};

			cmd_db: reserved-memory@80860000 {
			no-map;
			reg = <0x0 0x80860000 0x0 0x20000>;
			};

			smem_mem: smem@80900000 {
			no-map;
			reg = <0x0 0x80900000 0x0 0x200000>;
			};

			fw_mem: fw_mem@80b00000 {
			no-map;
			reg = <0x0 0x80b00000 0x0 0x100000>;
			};

			cdsp_secure_heap_mem: cdsp_secure_heap_mem@80c00000 {
			no-map;
			reg = <0x0 0x80c00000 0x0 0x4600000>;
			};

			pil_wlan_mem: wlan@86500000 {
			no-map;
			reg = <0x0 0x86500000 0x0 0x200000>;
			};

			pil_adsp_mem: adsp@86700000 {
			no-map;
			reg = <0x0 0x86700000 0x0 0x2800000>;
			};

			pil_cdsp_mem: cdsp@88f00000 {
			no-map;
			reg = <0x0 0x88f00000 0x0 0x1e00000>;
			};

			pil_camera_mem: camera@8ad00000 {
			no-map;
			reg = <0x0 0x8ad00000 0x0 0x500000>;
			};

			pil_video_mem: video@8b200000 {
			no-map;
			reg = <0x0 0x8b200000 0x0 0x500000>;
			};

			pil_ipa_fw_mem: ipa_fw@8b700000 {
			no-map;
			reg = <0x0 0x8b700000 0x0 0x10000>;
			};

			pil_ipa_gsi_mem: ipa_gsi@8b710000 {
			no-map;
			reg = <0x0 0x8b710000 0x0 0xa000>;
			};

			pil_gpu_micro_code_mem: gpu_micro_code@8b71a000 {
			no-map;
			reg = <0x0 0x8b71a000 0x0 0x2000>;
			};

			pil_mpss_wlan_mem: mpss_wlan@8b800000 {
			no-map;
			reg = <0x0 0x8b800000 0x0 0x10000000>;
			};

			removed_mem: removed_region@c0000000 {
			no-map;
			reg = <0x0 0xc0000000 0x0 0x5100000>;
			};

			pil_trustedvm_mem: pil_trustedvm_region@d0000000 {
			no-map;
			reg = <0x0 0xd0000000 0x0 0xa600000>;
			};

			/* global autoconfigured region for contiguous allocations */
			linux,cma {
			compatible = "shared-dma-pool";
			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
			reusable;
			alignment = <0x0 0x400000>;
			size = <0x0 0x2000000>;
			linux,cma-default;
			};
			};

	soc: soc { };		soc: soc { };

	chosen {		chosen {
	@@ -435,6 +536,7 @@
	#include "holi-pinctrl.dtsi"		#include "holi-pinctrl.dtsi"
	#include "holi-stub-regulator.dtsi"		#include "holi-stub-regulator.dtsi"
	#include "holi-gdsc.dtsi"		#include "holi-gdsc.dtsi"
			#include "holi-ion.dtsi"

	&gcc_camss_top_gdsc {		&gcc_camss_top_gdsc {
	status = "ok";		status = "ok";