Revert "common: sync code from openlinux in P [1/3]"

This reverts commit 972637c0a198b907a070c6774f81ad87de782ebb.

Reason for revert: do not need

Change-Id: I402feb9ceac0582a70f4292630c33fd1717b2e16

2 files changed, 10 insertions, 24 deletions

diff --git a/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts
index 5dd0d95..2fd451a 100755..100644
--- a/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxl_p244_1g.dts
@@ -397,7 +397,6 @@
 
 	ethmac: ethernet@0xc9410000 {
 			compatible = "amlogic, gxbb-eth-dwmac";
-			status = "disabled";
 			reg = <0x0 0xc9410000 0x0 0x10000
 			0x0 0xc8834540 0x0 0x8
 			0x0 0xc8834558 0x0 0xc>;
@@ -422,14 +421,14 @@
 		#thermal-sensor-cells = <1>;
 		cooling_devices {
 			cpufreq_cool_cluster0 {
-				min_state = <1000000>;
+				min_state = <1200000>;
 				dyn_coeff = <140>;
 				cluster_id = <0>;
 				node_name = "cpufreq_cool0";
 				device_type = "cpufreq";
 			};
 			cpucore_cool_cluster0 {
-				min_state = <3>;
+				min_state = <1>;
 				dyn_coeff = <0>;
 				cluster_id = <0>;
 				node_name = "cpucore_cool0";
@@ -473,22 +472,22 @@
 
 			trips {
 				switch_on: trip-point@0 {
-					temperature = <90000>;
+					temperature = <80000>;
 					hysteresis = <1000>;
 					type = "passive";
 				};
 				control: trip-point@1 {
-					temperature = <95000>;
+					temperature = <90000>;
 					hysteresis = <1000>;
 					type = "passive";
 				};
 				hot: trip-point@2 {
-					temperature = <105000>;
+					temperature = <100000>;
 					hysteresis = <5000>;
 					type = "hot";
 				};
 				critical: trip-point@3 {
-					temperature = <120000>;
+					temperature = <260000>;
 					hysteresis = <1000>;
 					type = "critical";
 				};
@@ -586,7 +585,7 @@
 	cvbsout {
 		compatible = "amlogic, cvbsout-gxl";
 		dev_name = "cvbsout";
-		status = "disabled";
+		status = "okay";
 		clocks = <&clkc CLKID_VCLK2_ENCI
 			&clkc CLKID_VCLK2_VENCI0
 			&clkc CLKID_VCLK2_VENCI1
@@ -883,13 +882,13 @@
 	dummy_codec:dummy{
 		#sound-dai-cells = <0>;
 		compatible = "amlogic, aml_dummy_codec";
-		status = "okay";
+		status = "disable";
 	};
 	amlogic_codec:t9015{
 		#sound-dai-cells = <0>;
 		compatible = "amlogic, aml_codec_T9015";
 		reg = <0x0 0xc8832000 0x0 0x14>;
-		status = "disable";
+		status = "okay";
 	};
 	aml_sound_meson {
 		compatible = "aml, meson-snd-card";
@@ -919,7 +918,7 @@
 			sound-dai = <&pcm_dai>;
 		};
 		codec0: codec0 {
-			sound-dai = <&dummy_codec>;
+			sound-dai = <&amlogic_codec>;
 		};
 		codec1: codec1 {
 			sound-dai = <&spdif_codec>;
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;