3 files changed, 240 insertions, 132 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 8f2b6eaf46b8..edfd67d25013 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -49,7 +49,7 @@ config RCAR_THERMAL
 
 config EXYNOS_THERMAL
         tristate "Temperature sensor on Samsung EXYNOS"
-        depends on ARCH_EXYNOS4 && THERMAL
+        depends on (ARCH_EXYNOS4 || ARCH_EXYNOS5) && THERMAL
         help
           If you say yes here you get support for TMU (Thermal Managment
           Unit) on SAMSUNG EXYNOS series of SoC.
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 556d15b4b029..c9a33dd5e4d8 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -33,44 +33,83 @@
 #include <linux/kobject.h>
 #include <linux/io.h>
 #include <linux/mutex.h>
-
 #include <linux/platform_data/exynos_thermal.h>
-
-#define EXYNOS4_TMU_REG_TRIMINFO        0x0
-#define EXYNOS4_TMU_REG_CONTROL         0x20
-#define EXYNOS4_TMU_REG_STATUS          0x28
-#define EXYNOS4_TMU_REG_CURRENT_TEMP    0x40
-#define EXYNOS4_TMU_REG_THRESHOLD_TEMP  0x44
-#define EXYNOS4_TMU_REG_TRIG_LEVEL0     0x50
-#define EXYNOS4_TMU_REG_TRIG_LEVEL1     0x54
-#define EXYNOS4_TMU_REG_TRIG_LEVEL2     0x58
-#define EXYNOS4_TMU_REG_TRIG_LEVEL3     0x5C
-#define EXYNOS4_TMU_REG_PAST_TEMP0      0x60
-#define EXYNOS4_TMU_REG_PAST_TEMP1      0x64
-#define EXYNOS4_TMU_REG_PAST_TEMP2      0x68
-#define EXYNOS4_TMU_REG_PAST_TEMP3      0x6C
-#define EXYNOS4_TMU_REG_INTEN           0x70
-#define EXYNOS4_TMU_REG_INTSTAT         0x74
-#define EXYNOS4_TMU_REG_INTCLEAR        0x78
-
-#define EXYNOS4_TMU_GAIN_SHIFT          8
-#define EXYNOS4_TMU_REF_VOLTAGE_SHIFT   24
-
-#define EXYNOS4_TMU_TRIM_TEMP_MASK      0xff
-#define EXYNOS4_TMU_CORE_ON     3
-#define EXYNOS4_TMU_CORE_OFF    2
-#define EXYNOS4_TMU_DEF_CODE_TO_TEMP_OFFSET     50
-#define EXYNOS4_TMU_TRIG_LEVEL0_MASK    0x1
-#define EXYNOS4_TMU_TRIG_LEVEL1_MASK    0x10
-#define EXYNOS4_TMU_TRIG_LEVEL2_MASK    0x100
-#define EXYNOS4_TMU_TRIG_LEVEL3_MASK    0x1000
-#define EXYNOS4_TMU_INTCLEAR_VAL        0x1111
-
-struct exynos4_tmu_data {
-        struct exynos4_tmu_platform_data *pdata;
+#include <linux/of.h>
+
+#include <plat/cpu.h>
+
+/* Exynos generic registers */
+#define EXYNOS_TMU_REG_TRIMINFO         0x0
+#define EXYNOS_TMU_REG_CONTROL          0x20
+#define EXYNOS_TMU_REG_STATUS           0x28
+#define EXYNOS_TMU_REG_CURRENT_TEMP     0x40
+#define EXYNOS_TMU_REG_INTEN            0x70
+#define EXYNOS_TMU_REG_INTSTAT          0x74
+#define EXYNOS_TMU_REG_INTCLEAR         0x78
+
+#define EXYNOS_TMU_TRIM_TEMP_MASK       0xff
+#define EXYNOS_TMU_GAIN_SHIFT           8
+#define EXYNOS_TMU_REF_VOLTAGE_SHIFT    24
+#define EXYNOS_TMU_CORE_ON              3
+#define EXYNOS_TMU_CORE_OFF             2
+#define EXYNOS_TMU_DEF_CODE_TO_TEMP_OFFSET      50
+
+/* Exynos4210 specific registers */
+#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP       0x44
+#define EXYNOS4210_TMU_REG_TRIG_LEVEL0  0x50
+#define EXYNOS4210_TMU_REG_TRIG_LEVEL1  0x54
+#define EXYNOS4210_TMU_REG_TRIG_LEVEL2  0x58
+#define EXYNOS4210_TMU_REG_TRIG_LEVEL3  0x5C
+#define EXYNOS4210_TMU_REG_PAST_TEMP0   0x60
+#define EXYNOS4210_TMU_REG_PAST_TEMP1   0x64
+#define EXYNOS4210_TMU_REG_PAST_TEMP2   0x68
+#define EXYNOS4210_TMU_REG_PAST_TEMP3   0x6C
+
+#define EXYNOS4210_TMU_TRIG_LEVEL0_MASK 0x1
+#define EXYNOS4210_TMU_TRIG_LEVEL1_MASK 0x10
+#define EXYNOS4210_TMU_TRIG_LEVEL2_MASK 0x100
+#define EXYNOS4210_TMU_TRIG_LEVEL3_MASK 0x1000
+#define EXYNOS4210_TMU_INTCLEAR_VAL     0x1111
+
+/* Exynos5250 and Exynos4412 specific registers */
+#define EXYNOS_TMU_TRIMINFO_CON 0x14
+#define EXYNOS_THD_TEMP_RISE            0x50
+#define EXYNOS_THD_TEMP_FALL            0x54
+#define EXYNOS_EMUL_CON         0x80
+
+#define EXYNOS_TRIMINFO_RELOAD          0x1
+#define EXYNOS_TMU_CLEAR_RISE_INT       0x111
+#define EXYNOS_TMU_CLEAR_FALL_INT       (0x111 << 16)
+#define EXYNOS_MUX_ADDR_VALUE           6
+#define EXYNOS_MUX_ADDR_SHIFT           20
+#define EXYNOS_TMU_TRIP_MODE_SHIFT      13
+
+#define EFUSE_MIN_VALUE 40
+#define EFUSE_MAX_VALUE 100
+
+/* In-kernel thermal framework related macros & definations */
+#define SENSOR_NAME_LEN 16
+#define MAX_TRIP_COUNT  8
+#define MAX_COOLING_DEVICE 4
+
+#define ACTIVE_INTERVAL 500
+#define IDLE_INTERVAL 10000
+
+/* CPU Zone information */
+#define PANIC_ZONE      4
+#define WARN_ZONE       3
+#define MONITOR_ZONE    2
+#define SAFE_ZONE       1
+
+#define GET_ZONE(trip) (trip + 2)
+#define GET_TRIP(zone) (zone - 2)
+
+struct exynos_tmu_data {
+        struct exynos_tmu_platform_data *pdata;
         struct resource *mem;
         void __iomem *base;
         int irq;
+        enum soc_type soc;
         struct work_struct irq_work;
         struct mutex lock;
         struct clk *clk;
@@ -81,16 +120,17 @@ struct exynos4_tmu_data {
  * TMU treats temperature as a mapped temperature code.
  * The temperature is converted differently depending on the calibration type.
  */
-static int temp_to_code(struct exynos4_tmu_data *data, u8 temp)
+static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
 {
-        struct exynos4_tmu_platform_data *pdata = data->pdata;
+        struct exynos_tmu_platform_data *pdata = data->pdata;
         int temp_code;
 
-        /* temp should range between 25 and 125 */
-        if (temp < 25 || temp > 125) {
-                temp_code = -EINVAL;
-                goto out;
-        }
+        if (data->soc == SOC_ARCH_EXYNOS4210)
+                /* temp should range between 25 and 125 */
+                if (temp < 25 || temp > 125) {
+                        temp_code = -EINVAL;
+                        goto out;
+                }
 
         switch (pdata->cal_type) {
         case TYPE_TWO_POINT_TRIMMING:
@@ -102,7 +142,7 @@ static int temp_to_code(struct exynos4_tmu_data *data, u8 temp)
                 temp_code = temp + data->temp_error1 - 25;
                 break;
         default:
-                temp_code = temp + EXYNOS4_TMU_DEF_CODE_TO_TEMP_OFFSET;
+                temp_code = temp + EXYNOS_TMU_DEF_CODE_TO_TEMP_OFFSET;
                 break;
         }
 out:
@@ -113,16 +153,17 @@ out:
  * Calculate a temperature value from a temperature code.
  * The unit of the temperature is degree Celsius.
  */
-static int code_to_temp(struct exynos4_tmu_data *data, u8 temp_code)
+static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code)
 {
-        struct exynos4_tmu_platform_data *pdata = data->pdata;
+        struct exynos_tmu_platform_data *pdata = data->pdata;
         int temp;
 
-        /* temp_code should range between 75 and 175 */
-        if (temp_code < 75 || temp_code > 175) {
-                temp = -ENODATA;
-                goto out;
-        }
+        if (data->soc == SOC_ARCH_EXYNOS4210)
+                /* temp_code should range between 75 and 175 */
+                if (temp_code < 75 || temp_code > 175) {
+                        temp = -ENODATA;
+                        goto out;
+                }
 
         switch (pdata->cal_type) {
         case TYPE_TWO_POINT_TRIMMING:
@@ -133,54 +174,92 @@ static int code_to_temp(struct exynos4_tmu_data *data, u8 temp_code)
                 temp = temp_code - data->temp_error1 + 25;
                 break;