Merge "ARM: dts: msm: memory map and ion heaps for msmthorium"

/*

 * Copyright (c) 2015, 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>;

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};

		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};

		qcom,ion-heap@8 { /* CP_MM HEAP */

			reg = <8>;

			memory-region = <&secure_mem>;

			qcom,ion-heap-type = "SECURE_DMA";

		};

		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <27>;

			memory-region = <&qseecom_mem>;

			qcom,ion-heap-type = "DMA";

		};

	};

};

	qcom,msm-id = <293 0x0>;

	qcom,msm-id = <293 0x0>;

	interrupt-parent = <&intc>;

	interrupt-parent = <&intc>;

	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		other_ext_mem: other_ext_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x85e00000 0x0 0xa00000>;

		};

		modem_mem: modem_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x86800000 0x0 0x5a00000>;

		};

		reloc_mem: reloc_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8c200000 0x0 0x1b00000>;

		};

		venus_mem: venus_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x0800000>;

		};

		secure_mem: secure_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x7000000>;

		};

		qseecom_mem: qseecom_region@0 {

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x1000000>;

		};

	};

	soc: soc { };

	soc: soc { };

};

};

#include "msmthorium-pinctrl.dtsi"

#include "msmthorium-pinctrl.dtsi"

#include "msmthorium-cpu.dtsi"

#include "msmthorium-cpu.dtsi"

#include "msmthorium-ion.dtsi"

&soc {

&soc {

	#address-cells = <1>;

	#address-cells = <1>;