Merge "ARM: dts: msm: add ion heaps for trinket" (3f1bae39) · Commits · e / devices / android_kernel_oneplus_sm8150

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

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

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

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

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

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

+107 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,112 @@
		};

		soc: soc { };

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

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

		xbl_aop_mem: xbl_aop_mem@25e00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x25e00000 0x0 0x140000>;
		};

		sec_apps_mem: sec_apps_region@25fff000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x25fff000 0x0 0x1000>;
		};

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

		removed_region: removed_region@26200000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x26200000 0 0x2d00000>;
		};

		pil_camera_mem: camera_region@2ab00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x2ab00000 0 0x500000>;
		};

		pil_modem_mem: modem_region@2b000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x2b000000 0 0x7e00000>;
		};

		pil_video_mem: pil_video_region@32e00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x32e00000 0 0x500000>;
		};

		wlan_msa_mem: wlan_msa_region@33300000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x33300000 0 0x100000>;
		};

		pil_cdsp_mem: cdsp_regions@33400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x33400000 0 0x800000>;
		};

		pil_adsp_mem: pil_adsp_region@33c00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x33c00000 0 0x1e00000>;
		};

		pil_ipa_fw_mem: ips_fw_region@35a00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x35a00000 0 0x10000>;
		};

		pil_ipa_gsi_mem: ipa_gsi_region@35a10000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x35a10000 0 0x5000>;
		};

		pil_gpu_mem: gpu_region@35a15000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0 0x35a15000 0 0x2000>;
		};

		qseecom_mem: qseecom_region@3e400000 {
		compatible = "shared-dma-pool";
		no-map;
		reg = <0 0x3e400000 0 0x1400000>;
		};

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

		&soc {
		@@ -517,3 +623,4 @@
		};
		};
		#include "trinket-pinctrl.dtsi"
		#include "trinket-ion.dtsi"