Merge "ARM: dts: msm: Add ion heap types of carveout and dma on trinket"

/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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

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

		};

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

			reg = <19>;

			memory-region = <&qseecom_ta_mem>;

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

		};

		qcom,ion-heap@9 {

			reg = <9>;

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

		};

		qcom,ion-heap@14 { /* SECURE CARVEOUT HEAP */

			reg = <14>;

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

			cdsp {

				memory-region = <&cdsp_sec_mem>;

				token = <0x20000000>;

			};

		};

	};

};