summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--[-rwxr-xr-x]arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts21
-rw-r--r--[-rwxr-xr-x]drivers/thermal/cpu_cooling.c13
2 files changed, 10 insertions, 24 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 99c7c82..f49d298 100755..100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -33,10 +33,6 @@
#include <trace/events/thermal.h>
-#define CON_TEMP 100000
-int TEMP = -1;
-int RET = -1;
-
/*
* Cooling state <-> CPUFreq frequency
*
@@ -432,10 +428,6 @@ static int get_static_power(struct cpufreq_cooling_device *cpufreq_device,
unsigned long voltage;
struct cpumask *cpumask = &cpufreq_device->allowed_cpus;
unsigned long freq_hz = freq * 1000;
- int temp;
-
- RET = tz->ops->get_temp(tz, &temp);
- TEMP = temp;
if (!cpufreq_device->plat_get_static_power ||
!cpufreq_device->cpu_dev) {
@@ -541,11 +533,6 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,
if (WARN_ON(state > cpufreq_device->max_level))
return -EINVAL;
- if (cpufreq_device->freq_table[state] == 1000000) {
- if (TEMP <= CON_TEMP)
- state = state - 1;
- }
-
/* Check if the old cooling action is same as new cooling action */
if (cpufreq_device->cpufreq_state == state)
return 0;