Merge "ARM: dts: msm: Include reserved memory and ION DT changes for sdmshrike" into msm-4.14 (ea4140a9) · Commits · e / devices / android_kernel_oneplus_sm8150

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

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-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@9 {
		reg = <9>;
		qcom,ion-heap-type = "SYSTEM_SECURE";
		};
		};
		};

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

+120 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,125 @@
		};
		};

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

		hyp_mem: hyp_mem@85700000 {
		no-map;
		reg = <0x0 0x85700000 0x0 0x600000>;
		};

		xbl_aop_mem: xbl_aop_mem@85e00000 {
		no-map;
		reg = <0x0 0x85e00000 0x0 0x140000>;
		};

		flex_sec_apps_mem: flex_sec_apps_regions@85ffd000 {
		no-map;
		reg = <0x0 0x85ffd000 0x0 0x3000>;
		};

		smem_region: smem@86000000 {
		no-map;
		reg = <0x0 0x86000000 0x0 0x200000>;
		};

		removed_regions: removed_regions@86200000 {
		no-map;
		reg = <0x0 0x86200000 0x0 0x5500000>;
		};

		pil_camera_mem: camera_region@8b700000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b700000 0x0 0x500000>;
		};

		pil_wlan_fw_mem: pil_wlan_fw_region@8bc00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bc00000 0x0 0x100000>;
		};

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

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

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

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

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

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

		pil_video_mem: pil_video_region@95500000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x95500000 0x0 0x500000>;
		};

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

		pil_slpi_mem: pil_slpi_region@96200000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x96200000 0x0 0x1400000>;
		};

		pil_spss_mem: pil_spss_region@97600000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x97600000 0x0 0x100000>;
		};

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

		/* 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>;
		linux,cma-default;
		};
		};

		soc: soc { };

		};
		@@ -595,3 +714,4 @@

		#include "sdmshrike-pinctrl.dtsi"
		#include "sdmshrike-regulators.dtsi"
		#include "sdmshrike-ion.dtsi"