Merge "ARM: dts: msm: Add secure carveout heap for kona" (fbb1779a) · Commits · e / devices / android_kernel_oneplus_sm7250

qcom/kona-ion.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -49,5 +49,14 @@
		memory-region = <&secure_display_memory>;
		qcom,ion-heap-type = "HYP_CMA";
		};

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

+15 −24

Original line number	Diff line number	Diff line
		@@ -489,24 +489,9 @@
		reg = <0x0 0x80900000 0x0 0x200000>;
		};

		lpass_pcie_mem: lpass_pcie_region@80b00000 {
		removed_mem: removed_region@80b00000 {
		no-map;
		reg = <0x0 0x80b00000 0x0 0x100000>;
		};

		ssc_pcie_mem: ssc_pcie_region@80c00000 {
		no-map;
		reg = <0x0 0x80c00000 0x0 0x100000>;
		};

		removed_mem: removed_region@80d00000 {
		no-map;
		reg = <0x0 0x80d00000 0x0 0x1300000>;
		};

		qtee_apps_mem: qtee_apps_region@82000000 {
		no-map;
		reg = <0x0 0x82000000 0x0 0x2600000>;
		reg = <0x0 0x80b00000 0x0 0x5300000>;
		};

		pil_camera_mem: pil_camera_region@86200000 {
		@@ -560,25 +545,31 @@
		pil_cdsp_mem: pil_cdsp_region@87800000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x87800000 0x0 0x800000>;
		reg = <0x0 0x87800000 0x0 0x1400000>;
		};

		pil_slpi_mem: pil_slpi_region@88c00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x88c00000 0x0 0x1500000>;
		};

		pil_slpi_mem: pil_slpi_region@88000000 {
		pil_adsp_mem: pil_adsp_region@8a100000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x88000000 0x0 0x1500000>;
		reg = <0x0 0x8a100000 0x0 0x1c00000>;
		};

		pil_adsp_mem: pil_adsp_region@89500000 {
		pil_spss_mem: pil_spss_region@8bd00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x89500000 0x0 0x1c00000>;
		reg = <0x0 0x8bd00000 0x0 0x100000>;
		};

		pil_spss_mem: pil_spss_region@8b100000 {
		cdsp_secure_heap: cdsp_secure_heap@8be00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b100000 0x0 0x100000>;
		reg = <0x0 0x8be00000 0x0 0x4600000>;
		};

		adsp_mem: adsp_region {