Merge "ARM: dts: msm: Update ion heap for scuba"

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

&soc {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#size-cells = <0>;

		system_heap: qcom,ion-heap@25 {

			reg = <25>;

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

			reg = <ION_SYSTEM_HEAP_ID>;

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

		};

		system_secure_heap: qcom,ion-heap@9 {

			reg = <9>;

			reg = <ION_SECURE_HEAP_ID>;

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

		};

		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

			reg = <10>;

			reg = <ION_SECURE_DISPLAY_HEAP_ID>;

			memory-region = <&secure_display_memory>;

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

		};

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

			reg = <27>;

			reg = <ION_QSECOM_HEAP_ID>;

			memory-region = <&qseecom_mem>;

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

		};

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

			reg = <19>;

			reg = <ION_QSECOM_TA_HEAP_ID>;

			memory-region = <&qseecom_ta_mem>;

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

		};

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>

#include "scuba-ion.dtsi"

&soc {

	scuba_batterydata: qcom,battery-data {