arm64: dts: kirin970: add ION dts entries and enable ION and IOMMU feature.

ION dts bits needed and enable ION and IOMMU feature.

Signed-off-by: liwei213 <liwei213@huawei.com>

arch/arm64/boot/dts/hisilicon/kirin970-hikey970.dts

@@ -14,6 +14,7 @@
 #include "kirin970_spmi.dtsi"
 #include "hisi_6421v600_pmic_spmi.dtsi"
 
+#include "kirin970-ion.dtsi"
 / {
 	model = "HiKey970";
 	compatible = "Hisilicon,kirin970-hikey970", "Hisilicon,kirin970";

arch/arm64/boot/dts/hisilicon/kirin970-ion.dtsi

@@ -0,0 +1,48 @@
+/ {
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		graphic_heap: graphic {
+			size  = <0x0 0x1E00000>;
+			alignment = <0x0 0x100000>;
+			alloc-ranges = <0x0 0x0 0x1 0x0>;
+			compatible = "hisi_ion";
+			heap-name = "carveout_gralloc";
+		};
+	};
+
+	hisi,ion {
+		compatible = "hisilicon,hisi-ion";
+
+		iommu_info {
+			start-addr = <0x40000>;
+			size = <0xbffc0000>;
+			iova-align = <0x0 0x8000>;
+		};
+
+		linear {
+			start-addr = <0x40000>;
+			size = <0xbffc0000>;
+			page-size = <0x1000>;
+			page-align = <0x40000>;
+		};
+
+		heap_sys_user@0 {
+			heap-name = "sys_heap";
+			heap-id   = <0x0>;
+			heap-base = <0x0>;
+			heap-size = <0x0>;
+			heap-type = "ion_system";
+		};
+
+		heap_carveout_gralloc@2 {
+			heap-name = <&graphic_heap>;
+			heap-id   = <0x2>;
+			heap-base = <0x0>;
+			heap-size = <0x0>;
+			heap-type = "ion_carveout";
+		};
+	};
+};

arch/arm64/configs/hikey970_defconfig

@@ -604,7 +604,7 @@ CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ION=y
-# CONFIG_ION_HISI is not set
+CONFIG_ION_HISI=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y
 CONFIG_COMMON_CLK_S2MPS11=y
@@ -621,7 +621,7 @@ CONFIG_PM_DEVFREQ=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_HISI_DDR_DEVFREQ=y
-# CONFIG_HISI_IOMMU_LPAE is not set
+CONFIG_HISI_IOMMU_LPAE=y
 CONFIG_ARM_SMMU=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y