PD#161216: cooldev: fix k49 and k314 config change.

Change-Id: I58fddf3ea8c12b8e4589b2bd95eef2d26d9ca348
Signed-off-by: Huan Biao <huan.biao@amlogic.com>

diff --git a/gpu-v2.mk b/gpu-v2.mk
index d295ece70b1e7b8384f171f1d9e7166093c0cacd..4a51f56d128f59f42ae9dd6cb81f92e22d4a39b1 100644 (file)
--- a/gpu-v2.mk
+++ b/gpu-v2.mk
@@ -40,7 +40,7 @@ define utgard-modules
        $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/$(PRODUCT_OUT)/obj/mali  \
        ARCH=$(3) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) CONFIG_MALI400=m  CONFIG_MALI450=m    \
        EXTRA_CFLAGS="-DCONFIG_MALI400=m -DCONFIG_MALI450=m" \
-       CONFIG_GPU_THERMAL=y CONFIG_AM_VDEC_H264_4K2K=y modules
+       CONFIG_AM_VDEC_H264_4K2K=y modules
 
        @echo "GPU_MODS_OUT is $(GPU_MODS_OUT)"
        mkdir -p $(PRODUCT_OUT)/$(GPU_MODS_OUT)

diff --git a/gpu.mk b/gpu.mk
index 151b3d0f4a53f628a62bfb83e51433f7b99e5ae1..d6d04363f1cc48342d72959068a41dac2752cbe0 100644 (file)
--- a/gpu.mk
+++ b/gpu.mk
@@ -64,7 +64,7 @@ $(MALI_KO):
        $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/$(MALI_OUT)/ \
        ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) CONFIG_MALI400=m  CONFIG_MALI450=m    \
        EXTRA_CFLAGS="-DCONFIG_MALI400=m -DCONFIG_MALI450=m" \
-       CONFIG_GPU_THERMAL=y CONFIG_AM_VDEC_H264_4K2K=y modules
+       CONFIG_AM_VDEC_H264_4K2K=y modules
 
        @echo "GPU_MODS_OUT is $(GPU_MODS_OUT)"
        mkdir -p $(PRODUCT_OUT)/$(GPU_MODS_OUT)

diff --git a/midgard/r11p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r11p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index d16675ef03850acab3551f070aceca61edb924e0..b95190622daaa067c21e7b6c75c7744cd738e858 100644 (file)
--- a/midgard/r11p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r11p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -101,7 +106,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -133,7 +138,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -196,7 +201,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/midgard/r12p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r12p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index d16675ef03850acab3551f070aceca61edb924e0..30b978bfe8192f9903c3ba58c570c4d20d3d89d1 100644 (file)
--- a/midgard/r12p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r12p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined (CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined (CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -101,7 +106,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -133,7 +138,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -196,7 +201,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/midgard/r13p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r13p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index d16675ef03850acab3551f070aceca61edb924e0..78380a2a4d3959f2065ccb0cce68bf6855d2b063 100644 (file)
--- a/midgard/r13p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r13p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -101,7 +106,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -133,7 +138,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -196,7 +201,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/midgard/r14p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r14p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index d16675ef03850acab3551f070aceca61edb924e0..78380a2a4d3959f2065ccb0cce68bf6855d2b063 100644 (file)
--- a/midgard/r14p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r14p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -101,7 +106,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -133,7 +138,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -196,7 +201,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/midgard/r15p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r15p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index d16675ef03850acab3551f070aceca61edb924e0..b95190622daaa067c21e7b6c75c7744cd738e858 100644 (file)
--- a/midgard/r15p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r15p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -101,7 +106,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -133,7 +138,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -196,7 +201,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/midgard/r16p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/midgard/r16p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index 26a56f65670d5c68f7ffa2cfc74bb3238520dee3..d057897bf0791e58afce44fdef858e0ee5d4993f 100644 (file)
--- a/midgard/r16p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/midgard/r16p0/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,7 +20,12 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
+#include <linux/gpu_cooling.h>
+#include <linux/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
@@ -100,7 +105,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -132,7 +137,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -195,7 +200,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/t83x/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c b/t83x/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
index 26a56f65670d5c68f7ffa2cfc74bb3238520dee3..4ffbfb01300a68b6920a7b2765f2cf7c93aca65d 100644 (file)
--- a/t83x/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
+++ b/t83x/kernel/drivers/gpu/arm/midgard/platform/devicetree/platform_gx.c
@@ -20,11 +20,16 @@
 #include <mach/io.h>
 #endif
 #include <asm/io.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #include <linux/amlogic/aml_thermal_hw.h>
 #endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#include <linux/amlogic/aml_thermal_hw.h>
+#endif
 
 #include "mali_scaling.h"
 #include "mali_clock.h"
@@ -100,7 +105,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -132,7 +137,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -195,7 +200,7 @@ int mali_meson_uninit(struct platform_device* ptr_plt_dev)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_GPU_THERMAL) || defined(CONFIG_AMLOGIC_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/utgard/platform/meson_bu/platform_gx.c b/utgard/platform/meson_bu/platform_gx.c
index 79f513ccf857650232f805f37fc92fc2766d9c12..2842254b8c4c7ce0cef7ef567b48442675bee93d 100644 (file)
--- a/utgard/platform/meson_bu/platform_gx.c
+++ b/utgard/platform/meson_bu/platform_gx.c
@@ -29,6 +29,14 @@
 #include <common/mali_ukk.h>
 #endif
 #endif
+#ifdef CONFIG_AMLOGIC_GPU_THERMAL
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#ifdef CONFIG_DEVFREQ_THERMAL
+#include <linux/amlogic/aml_thermal_hw.h>
+#include <common/mali_ukk.h>
+#endif
+#endif
 #include <common/mali_kernel_common.h>
 #include <common/mali_osk_profiling.h>
 #include <common/mali_pmu.h>
@@ -109,7 +117,7 @@ int get_gpu_max_clk_level(void)
     return mali_plat_data.cfg_clock;
 }
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -137,7 +145,7 @@ static u32 get_mali_utilization(void)
 #endif
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -341,7 +349,7 @@ int mali_deep_resume(struct device *device)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;
@@ -363,7 +371,7 @@ void mali_post_init(void)
         gcdev->get_online_pp = mali_get_online_pp;
 #endif
         err = gpufreq_cooling_register(gcdev);
-#ifdef CONFIG_DEVFREQ_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
         aml_thermal_min_update(gcdev->cool_dev);
 #endif
         if (err < 0)

diff --git a/utgard/platform/meson_m450/platform_m8.c b/utgard/platform/meson_m450/platform_m8.c
index 66a4e25bf4059b15b55a8368468e867c42a2e10c..9eaad3e137bb03a7a760ce8ee246199104b7a8f3 100644 (file)
--- a/utgard/platform/meson_m450/platform_m8.c
+++ b/utgard/platform/meson_m450/platform_m8.c
@@ -21,10 +21,14 @@
 #endif
 #include <asm/io.h>
 #include <linux/mali/mali_utgard.h>
-#ifdef CONFIG_GPU_THERMAL
+#if defined (CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
 #endif
+#if defined (CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#endif
 #include <common/mali_kernel_common.h>
 #include <common/mali_osk_profiling.h>
 #include <common/mali_pmu.h>
@@ -184,7 +188,7 @@ static struct resource mali_gpu_resources[] =
             INT_MALI_PP)
 };
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static void set_limit_mali_freq(u32 idx)
 {
     if (mali_plat_data.limit_on == 0)
@@ -201,7 +205,7 @@ static u32 get_limit_mali_freq(void)
 }
 #endif
 
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
 static u32 set_limit_pp_num(u32 num)
 {
     u32 ret = -1;
@@ -450,7 +454,7 @@ int mali_deep_resume(struct device *device)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;

diff --git a/utgard/platform/meson_m450/platform_m8b.c b/utgard/platform/meson_m450/platform_m8b.c
index 692aafe5c2f251d8deac6cd8a34cb2e7fd5dffaf..99d86b8b63c8b86ba3f0455d38c014e57022e093 100644 (file)
--- a/utgard/platform/meson_m450/platform_m8b.c
+++ b/utgard/platform/meson_m450/platform_m8b.c
@@ -19,8 +19,15 @@
 #include <mach/io.h>
 #include <asm/io.h>
 #include <linux/mali/mali_utgard.h>
+#if defined(CONFIG_GPU_THERMAL)
 #include <linux/gpu_cooling.h>
 #include <linux/gpucore_cooling.h>
+#endif
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL)
+#include <linux/amlogic/gpu_cooling.h>
+#include <linux/amlogic/gpucore_cooling.h>
+#endif
+
 #include <common/mali_kernel_common.h>
 #include <common/mali_osk_profiling.h>
 #include <common/mali_pmu.h>
@@ -433,7 +440,7 @@ int mali_deep_resume(struct device *device)
 
 void mali_post_init(void)
 {
-#ifdef CONFIG_GPU_THERMAL
+#if defined(CONFIG_AMLOGIC_GPU_THERMAL) || defined(CONFIG_GPU_THERMAL)
     int err;
     struct gpufreq_cooling_device *gcdev = NULL;
     struct gpucore_cooling_device *gccdev = NULL;