Merge pull request torvalds#89 from hzhuang1/uefi_android

Uefi android
hzhuang1 · Jul 7, 2015 · a5e5d0e · a5e5d0e
2 parents 5c27e19 + fe87345
commit a5e5d0e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 49 deletions.
diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts
@@ -194,4 +194,20 @@
 		startup-delay-us = <70000>;
 		enable-active-high;
 	};
+
+        hisi-ion@0 {
+                compatible = "hisilicon,ion";
+
+                heap_sys_user@0 {
+                        heap-name = "sys_user";
+                        heap-range = <0x0 0x0>;
+                        heap-type = "ion_system";
+                };
+
+                heap_sys_contig@0 {
+                        heap-name = "sys_contig";
+                        heap-range = <0x0 0x0>;
+                        heap-type = "ion_system_contig";
+                };
+        };
 };
diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi
@@ -956,54 +956,6 @@
                 };
 	};
 
-        hisi-ion@0 {
-                compatible = "hisilicon,ion";
-                memreserve_base = <0x1ff00000>;
-                memreserve_size = <0x18d00000>;
-
-                heap_fb@0 {
-                        heap-name = "fb";
-                        heap-range = <0x37300000 0x01900000>;
-                        heap-type = "ion_carveout";
-                };
-
-                heap_vpu@0 {
-                        heap-name = "vpu";
-                        heap-range = <0x34200000 0x03100000>;
-                        heap-type = "ion_carveout";
-                };
-
-                heap_jpu@0 {
-                        heap-name = "jpu";
-                        heap-range = <0x33100000 0x01100000>;
-                        heap-type = "ion_carveout";
-                };
-
-                heap_gralloc@0 {
-                        heap-name = "gralloc-carveout";
-                        heap-range = <0x27b00000 0x0b600000>;
-                        heap-type = "ion_carveout";
-                };
-
-                heap_overlay@0 {
-                        heap-name = "overlay";
-                        heap-range = <0x1ff00000 0x07c00000>;
-                        heap-type = "ion_carveout";
-                };
-
-                heap_sys_user@0 {
-                        heap-name = "sys_user";
-                        heap-range = <0x0 0x0>;
-                        heap-type = "ion_system";
-                };
-
-                heap_sys_contig@0 {
-                        heap-name = "sys_contig";
-                        heap-range = <0x0 0x0>;
-                        heap-type = "ion_system_contig";
-                };
-        };
-
 	mali:mali@f4080000 {
 		compatible = "arm,mali-450", "arm,mali-utgard";
 		reg = <0x0 0x3f100000 0x0 0x00708000>;

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
@@ -278,7 +278,6 @@ CONFIG_MALI_PLAT_SPECIFIC_DT=y
 CONFIG_DRM=y
 CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_HISI=y
-CONFIG_ION=y
 CONFIG_ION_HISI=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FRAMEBUFFER_CONSOLE=y

diff --git a/drivers/gpu/arm/utgard/linux/mali_memory_external.c b/drivers/gpu/arm/utgard/linux/mali_memory_external.c
@@ -47,10 +47,12 @@ _mali_osk_errcode_t _mali_ukk_map_external_mem(_mali_uk_map_external_mem_s *args
 			  args->phys_addr, (args->phys_addr + args->size - 1),
 			  args->mali_address));
 
+#if 0
 	/* Validate the mali physical range */
 	if (_MALI_OSK_ERR_OK != mali_mem_validation_check(args->phys_addr, args->size)) {
 		return _MALI_OSK_ERR_FAULT;
 	}
+#endif
 
 	descriptor = mali_mem_descriptor_create(session, MALI_MEM_EXTERNAL);
 	if (NULL == descriptor) MALI_ERROR(_MALI_OSK_ERR_NOMEM);