Merge branch 'mali-android' into stable-android-ux500-3.3-1

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/default/mali_platform.c b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/default/mali_platform.c
index 36301a93a2c..9e64ce75344 100644
--- a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/default/mali_platform.c
+++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/platform/default/mali_platform.c
@@ -17,34 +17,27 @@
 #include "mali_platform.h"
 
 
-_mali_osk_errcode_t mali_platform_init(_mali_osk_resource_t *resource)
+_mali_osk_errcode_t mali_platform_init(void)
 {
     MALI_SUCCESS;
 }
 
-_mali_osk_errcode_t mali_platform_deinit(_mali_osk_resource_type_t *type)
+_mali_osk_errcode_t mali_platform_deinit(void)
 {
     MALI_SUCCESS;
 }
 
-_mali_osk_errcode_t mali_platform_powerdown(u32 cores)
+_mali_osk_errcode_t mali_platform_power_mode_change(mali_power_mode power_mode)
 {
     MALI_SUCCESS;
 }
 
-_mali_osk_errcode_t mali_platform_powerup(u32 cores)
+void mali_gpu_utilization_handler(u32 utilization)
 {
-    MALI_SUCCESS;
 }
 
-void mali_gpu_utilization_handler(u32 utilization)
+void set_mali_parent_power_domain(void* dev)
 {
 }
 
-#if MALI_POWER_MGMT_TEST_SUITE
-u32 pmu_get_power_up_down_info(void)
-{
-	return 4095;
 
-}
-#endif