diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7341aa68f78f..9067d83e343f 100755
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -64,7 +64,7 @@
 		cooling-min-state = <0>;
 		cooling-max-state = <3>;
 		#cooling-cells = <2>;
-		cooling-levels = <0 130 170 230>;
+		cooling-levels = <0 150 190 252>;
 	};
 	
 	mali: mali@0x11800000 {
@@ -112,17 +112,17 @@
 			polling-delay = <1000>;
 			trips {
 				cpu_alert0: cpu-alert-0 {
-					temperature = <75000>; /* millicelsius */
+					temperature = <70000>; /* millicelsius */
 					hysteresis = <10000>; /* millicelsius */
 					type = "passive";
 				};
 				cpu_alert1: cpu-alert-1 {
-					temperature = <80000>; /* millicelsius */
+					temperature = <75000>; /* millicelsius */
 					hysteresis = <10000>; /* millicelsius */
 					type = "passive";
 				};
 				cpu_alert2: cpu-alert-2 {
-					temperature = <85000>; /* millicelsius */
+					temperature = <80000>; /* millicelsius */
 					hysteresis = <10000>; /* millicelsius */
 					type = "passive";
 				};
@@ -166,31 +166,29 @@
 					cooling-device = <&fan0 2 3>;
 				};
 				/*
-				 * When reaching cpu_alert3, reduce CPU
-				 * by 2 steps. On Exynos5422/5800 that would
-				 * be: 1600 MHz and 1100 MHz.
+				 * First trip for A7: 1000Mhz
+				 * First trip for A15: 1400Mhz
 				 */
 				map3 {
 					trip = <&cpu_alert3>;
-					cooling-device = <&cpu0 0 2>;
+					cooling-device = <&cpu0 0 6>;
 				};
 				map4 {
 					trip = <&cpu_alert3>;
-					cooling-device = <&cpu4 0 2>;
+					cooling-device = <&cpu4 0 3>;
 				};
 
 				/*
-				 * When reaching cpu_alert4, reduce CPU
-				 * further, down to 600 MHz (11 steps for big,
-				 * 7 steps for LITTLE).
+				 * Second trip for A15: 600Mhz
+				 * Second trip for A7: 600Mhz
 				 */
 				map5 {
 					trip = <&cpu_alert4>;
-					cooling-device = <&cpu0 3 8>;
+					cooling-device = <&cpu0 3 7>;
 				};
 				map6 {
 					trip = <&cpu_alert4>;
-					cooling-device = <&cpu4 3 13>;
+					cooling-device = <&cpu4 3 14>;
 				};
 			};
 		};
diff --git a/arch/arm/configs/odroidxu3_defconfig b/arch/arm/configs/odroidxu3_defconfig
index 2216319527cc..7b2b4017a34b 100644
--- a/arch/arm/configs/odroidxu3_defconfig
+++ b/arch/arm/configs/odroidxu3_defconfig
@@ -2784,7 +2784,7 @@ CONFIG_SENSORS_PWM_FAN=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -2795,8 +2795,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 CONFIG_CPU_THERMAL=y
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_QORIQ_THERMAL is not set