Merge "ARM: dts: msm: Add initial ION heaps for SA2150P"

#include <dt-bindings/arm/msm/msm_ion_ids.h>

&soc {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;

		system_heap: qcom,ion-heap@25 {

			reg = <ION_SYSTEM_HEAP_ID>;

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

		};

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

			status = "disabled";

			reg = <ION_CP_MM_HEAP_ID>;

			memory-region = <&secure_mem>;

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

		};

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

			reg = <ION_QSECOM_HEAP_ID>;

			memory-region = <&qseecom_mem>;

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

		};

		qcom,ion-heap@19 { /* QSEECOM TA HEAP */

			reg = <ION_QSECOM_TA_HEAP_ID>;

			memory-region = <&qseecom_ta_mem>;

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

		};

	};

};

#include "qcs405-cpu.dtsi"

#include "pms405-rpm-regulator.dtsi"

#include "qcs405-regulator.dtsi"

#include "qcs405-ion.dtsi"