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

&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";

		};

		system_secure_heap: qcom,ion-heap@9 {

			reg = <9>;

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

		};

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

			status = "disabled";

			reg = <14>;

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

			cdsp {

				memory-region = <&cdsp_secure_heap>;

				token = <0x20000000>;

			};

		};

	};

};

#include "lahaina-pinctrl.dtsi"

#include "lahaina-smp2p.dtsi"

#include "lahaina-ion.dtsi"

#include "msm-arm-smmu-lahaina.dtsi"

#include "lahaina-usb.dtsi"