Merge "ARM: dts: msm: add ion cma heaps for msmcobalt" (43c1c94c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/msmcobalt-ion.dtsi

+24 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -25,5 +25,28 @@
		reg = <21>;
		qcom,ion-heap-type = "SYSTEM_CONTIG";
		};

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

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

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

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -251,6 +251,30 @@
		no-map;
		reg = <0 0x8a700000 0 0x6d00000>;
		};

		adsp_mem: adsp_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0 0x00000000 0 0xffffffff>;
		reusable;
		alignment = <0 0x100000>;
		size = <0 0x400000>;
		};

		qseecom_mem: qseecom_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0 0x00000000 0 0xffffffff>;
		reusable;
		alignment = <0 0x400000>;
		size = <0 0x1400000>;
		};

		secure_display_memory: secure_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0 0x00000000 0 0xffffffff>;
		reusable;
		alignment = <0 0x200000>;
		size = <0 0x5c00000>;
		};
		};
		};