Merge "ARM: dts: msm: add ion heaps for lagoon" (374855da) · Commits · e / devices / android_kernel_fairphone_FP4

qcom/lagoon-ion.dtsi

0 → 100644

+26 −0

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

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

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

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

qcom/lagoon.dtsi

+113 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,118 @@
		};

		soc: soc { };

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

		hyp_region: hyp_region@80000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x80000000 0x0 0x600000>;
		};

		xbl_aop_mem: xbl_aop_mem@80700000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x80700000 0x0 0x180000>;
		};

		sec_apps_mem: sec_apps_region@808ff000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x808ff000 0x0 0x1000>;
		};

		smem_region: smem@80900000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x80900000 0x0 0x200000>;
		};

		removed_region: removed_region@80b00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x80b00000 0x0 0x3900000>;
		};

		pil_camera_mem: camera_region@86000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86000000 0x0 0x500000>;
		};

		npu_mem: npu_region@86500000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86500000 0x0 0x500000>;
		};

		pil_video_mem: pil_video_region@86a00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86a00000 0x0 0x500000>;
		};

		pil_cdsp_mem: cdsp_regions@86f00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86f00000 0x0 0x1e00000>;
		};

		pil_adsp_mem: pil_adsp_region@88d00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x88d00000 0x0 0x2800000>;
		};

		wlan_fw_mem: wlan_fw_region@8b500000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b500000 0x0 0x200000>;
		};

		pil_ipa_fw_mem: ipa_fw_region@8b700000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b700000 0x0 0x10000>;
		};

		pil_ipa_gsi_mem: ipa_gsi_region@8b710000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b710000 0x0 0x5400>;
		};

		pil_gpu_mem: gpu_region@8b715400 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b715400 0x0 0x2000>;
		};

		pil_modem_mem: modem_region@8b800000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b800000 0x0 0xf800000>;
		};

		cdsp_sec_mem: cdsp_sec_regions@0x9f400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x9f400000 0x0 0x1e00000>;
		};

		/* 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 {
		@@ -944,3 +1056,4 @@

		#include "lagoon-pinctrl.dtsi"
		#include "lagoon-stub-regulator.dtsi"
		#include "lagoon-ion.dtsi"