Merge "ARM: dts: msm: Add ION entries for sdmshrike." (5ecb8e87) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sdmshrike-ion.dtsi

+37 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2019, 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
		@@ -21,6 +21,42 @@
		qcom,ion-heap-type = "SYSTEM";
		};

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

		qcom,ion-heap@26 { /* USER CONTIG HEAP */
		reg = <26>;
		memory-region = <&user_contig_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@19 { /* QSEECOM TA HEAP */
		reg = <19>;
		memory-region = <&qseecom_ta_mem>;
		qcom,ion-heap-type = "DMA";
		};

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

		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";

arch/arm64/boot/dts/qcom/sdmshrike.dtsi

+88 −23

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@
		};
		};

		reserved-memory {
		reserved_memory: reserved-memory {
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;
		@@ -437,67 +437,67 @@
		pil_wlan_fw_mem: pil_wlan_fw_region@8bc00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bc00000 0x0 0x100000>;
		reg = <0x0 0x8bc00000 0x0 0x180000>;
		};

		pil_ipa_fw_mem: pil_ipa_fw_region@8bd00000 {
		pil_npu_mem: pil_npu_region@0x8bd80000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bd00000 0x0 0x10000>;
		reg = <0x0 0x8bd80000 0x0 0x80000>;
		};

		pil_ipa_gsi_mem: pil_ipa_gsi_region@8bd10000 {
		pil_adsp_mem: pil_adsp_region@0x8be00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bd10000 0x0 0x5000>;
		reg = <0x0 0x8be00000 0x0 0x1a00000>;
		};

		pil_gpu_mem: pil_gpu_region@8bd15000 {
		pil_modem_mem: modem_region@0x8d800000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bd15000 0x0 0x2000>;
		reg = <0x0 0x8d800000 0x0 0x9600000>;
		};

		pil_npu_mem: pil_npu_region@8bd80000 {
		pil_video_mem: pil_video_region@0x96e00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bd80000 0x0 0x80000>;
		reg = <0x0 0x96e00000 0x0 0x500000>;
		};

		pil_adsp_mem: pil_adsp_region@8be00000 {
		pil_slpi_mem: pil_slpi_region@0x97300000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8be00000 0x0 0x1a00000>;
		reg = <0x0 0x97300000 0x0 0x1400000>;
		};

		pil_modem_mem: modem_region@8d800000 {
		pil_ipa_fw_mem: pil_ipa_fw_region@0x98700000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8d800000 0x0 0x8f00000>;
		reg = <0x0 0x98700000 0x0 0x10000>;
		};

		pil_video_mem: pil_video_region@95500000 {
		pil_ipa_gsi_mem: pil_ipa_gsi_region@0x98710000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x96700000 0x0 0x500000>;
		reg = <0x0 0x98710000 0x0 0x5000>;
		};

		pil_cdsp_mem: cdsp_regions@95a00000 {
		pil_gpu_mem: pil_gpu_region@0x98715000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x96C00000 0x0 0x800000>;
		reg = <0x0 0x98715000 0x0 0x2000>;
		};

		pil_slpi_mem: pil_slpi_region@96200000 {
		pil_spss_mem: pil_spss_region@0x98800000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x97400000 0x0 0x1400000>;
		reg = <0x0 0x98800000 0x0 0x100000>;
		};

		pil_spss_mem: pil_spss_region@97600000 {
		pil_cdsp_mem: cdsp_regions@0x98900000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98800000 0x0 0x100000>;
		reg = <0x0 0x98900000 0x0 0x1400000>;
		};

		qseecom_mem: qseecom_region@0x9e400000 {
		@@ -506,13 +506,78 @@
		reg = <0x0 0x9e400000 0x0 0x1400000>;
		};


		cont_splash_memory: cont_splash_region@0x9c000000 {
		reg = <0x0 0x9c000000 0x0 0x02400000>;
		label = "cont_splash_region";
		};

		disp_rdump_memory: disp_rdump_region@0x9c000000 {
		reg = <0x0 0x9c000000 0x0 0x02400000>;
		label = "disp_rdump_region";
		};

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

		cdsp_mem: cdsp_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0x400000>;
		};

		user_contig_mem: user_contig_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0x1000000>;
		};

		qseecom_ta_mem: qseecom_ta_region {
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0x1000000>;
		};

		sp_mem: sp_region { /* SPSS-HLOS ION shared mem */
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0x800000>;
		};

		secure_display_memory: secure_display_region { /* Secure UI */
		compatible = "shared-dma-pool";
		alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
		reusable;
		alignment = <0x0 0x400000>;
		size = <0x0 0xA000000>;
		};

		dump_mem: mem_dump_region {
		compatible = "shared-dma-pool";
		reusable;
		size = <0 0x2400000>;
		};

		/* 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>;
		size = <0x0 0x2800000>;
		linux,cma-default;
		};
		};