Merge "ARM: dts: msm: add ion heaps for qcs405" (ff810a30) · Commits · e / devices / android_kernel_oneplus_sm8150

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

0 → 100644

+30 −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";
		};
		};
		};

+62 −0

Original line number	Diff line number	Diff line
		@@ -34,10 +34,71 @@
		#size-cells = <2>;
		ranges;

		removed_region0: removed_region@85600000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x85600000 0x0 0x900000>;
		};

		smem_region: smem@85f00000 {
		no-map;
		reg = <0x0 0x85f00000 0x0 0x200000>;
		};

		removed_region1: removed_region@86100000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86100000 0x0 0x300000>;
		};

		wlan_fw_mem: wlan_fw_mem@86400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86400000 0x0 0x1c00000>;
		};

		adsp_fw_mem: adsp_fw_mem@88000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x88000000 0x0 0x1a00000>;
		};

		cdsp_fw_mem: cdsp_fw_mem@89a00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x89a00000 0x0 0x600000>;
		};

		secure_mem: secure_region {
		compatible = "shared-dma-pool";
		reusable;
		alignment = <0 0x400000>;
		size = <0 0x7000000>;
		};

		qseecom_mem: qseecom_region {
		compatible = "shared-dma-pool";
		reusable;
		alignment = <0 0x400000>;
		size = <0 0x1000000>;
		};

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

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

		aliases {
		@@ -52,6 +113,7 @@
		#include "qcs405-pinctrl.dtsi"
		#include "qcs405-blsp.dtsi"
		#include "qcs405-cpu.dtsi"
		#include "qcs405-ion.dtsi"

		&soc {
		#address-cells = <1>;