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

#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 = "SYSTEM";

		};

		system_secure_heap: qcom,ion-heap@9 {

			reg = <ION_SECURE_HEAP_ID>;

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

		};

	};

};

#include "shima-pinctrl.dtsi"

#include "shima-stub-regulator.dtsi"

#include "shima-gdsc.dtsi"

#include "shima-ion.dtsi"

&gcc_pcie_0_gdsc {

	status = "ok";