thermal: exynos: Bifurcate exynos thermal common and tmu controller code

This code bifurcates exynos thermal implementation into common and sensor
specific parts. The common thermal code interacts with core thermal layer and
core cpufreq cooling parts and is independent of SOC specific driver. This
change is needed to cleanly add support for new TMU sensors.

Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>

5 files changed, 491 insertions, 419 deletions

diff --git a/drivers/thermal/samsung/Kconfig b/drivers/thermal/samsung/Kconfig
index 2cf31ad90fa9..f8100b1b953a 100644
--- a/drivers/thermal/samsung/Kconfig
+++ b/drivers/thermal/samsung/Kconfig
@@ -1,8 +1,17 @@
 config EXYNOS_THERMAL
-        tristate "Temperature sensor on Samsung EXYNOS"
+        tristate "Exynos thermal management unit driver"
         depends on ARCH_HAS_BANDGAP
         help
-          If you say yes here you get support for TMU (Thermal Management
-          Unit) on SAMSUNG EXYNOS series of SoC. This helps in registering
-          the exynos thermal driver with the core thermal layer and cpu
-          cooling API's.
+          If you say yes here you get support for the TMU (Thermal Management
+          Unit) driver for SAMSUNG EXYNOS series of soc. This driver initialises
+          the TMU, reports temperature and handles cooling action if defined.
+          This driver uses the exynos core thermal API's.
+
+config EXYNOS_THERMAL_CORE
+        bool "Core thermal framework support for EXYNOS SOC's"
+        depends on EXYNOS_THERMAL
+        help
+          If you say yes here you get support for EXYNOS TMU
+          (Thermal Management Unit) common registration/unregistration
+          functions to the core thermal layer and also to use the generic
+          cpu cooling API's.
diff --git a/drivers/thermal/samsung/Makefile b/drivers/thermal/samsung/Makefile
index 1fe6d939e8f1..6227d4fbec08 100644
--- a/drivers/thermal/samsung/Makefile
+++ b/drivers/thermal/samsung/Makefile
@@ -1,4 +1,6 @@
 #
 # Samsung thermal specific Makefile
 #
-obj-$(CONFIG_EXYNOS_THERMAL)    += exynos_thermal.o
+obj-$(CONFIG_EXYNOS_THERMAL)                    += exynos_soc_thermal.o
+exynos_soc_thermal-y                            := exynos_thermal.o
+exynos_soc_thermal-$(CONFIG_EXYNOS_THERMAL_CORE) += exynos_thermal_common.o
diff --git a/drivers/thermal/samsung/exynos_thermal.c b/drivers/thermal/samsung/exynos_thermal.c
index 9af4b93c9f86..f3500ab6615d 100644
--- a/drivers/thermal/samsung/exynos_thermal.c
+++ b/drivers/thermal/samsung/exynos_thermal.c
@@ -21,23 +21,15 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
 #include <linux/clk.h>
-#include <linux/workqueue.h>
-#include <linux/sysfs.h>
-#include <linux/kobject.h>
 #include <linux/io.h>
-#include <linux/mutex.h>
-#include <linux/platform_data/exynos_thermal.h>
-#include <linux/thermal.h>
-#include <linux/cpufreq.h>
-#include <linux/cpu_cooling.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/exynos_thermal.h>
+
+#include "exynos_thermal_common.h"
 
 /* Exynos generic registers */
 #define EXYNOS_TMU_REG_TRIMINFO         0x0
@@ -88,16 +80,6 @@
 #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 MAX_THRESHOLD_LEVS 4
-
-#define ACTIVE_INTERVAL 500
-#define IDLE_INTERVAL 10000
-#define MCELSIUS        1000
-
 #ifdef CONFIG_THERMAL_EMULATION
 #define EXYNOS_EMUL_TIME        0x57F0
 #define EXYNOS_EMUL_TIME_SHIFT  16
@@ -106,17 +88,6 @@
 #define EXYNOS_EMUL_ENABLE      0x1
 #endif /* CONFIG_THERMAL_EMULATION */
 
-/* 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)
-
-#define EXYNOS_ZONE_COUNT       3
-
 struct exynos_tmu_data {
         struct exynos_tmu_platform_data *pdata;
         struct resource *mem;
@@ -129,384 +100,6 @@ struct exynos_tmu_data {
         u8 temp_error1, temp_error2;
 };
 
-struct  thermal_trip_point_conf {
-        int trip_val[MAX_TRIP_COUNT];
-        int trip_count;
-        u8 trigger_falling;
-};
-
-struct  thermal_cooling_conf {
-        struct freq_clip_table freq_data[MAX_TRIP_COUNT];
-        int freq_clip_count;
-};
-
-struct thermal_sensor_conf {
-        char name[SENSOR_NAME_LEN];
-        int (*read_temperature)(void *data);
-        int (*write_emul_temp)(void *drv_data, unsigned long temp);
-        struct thermal_trip_point_conf trip_data;
-        struct thermal_cooling_conf cooling_data;
-        void *private_data;
-};
-
-struct exynos_thermal_zone {
-        enum thermal_device_mode mode;
-        struct thermal_zone_device *therm_dev;
-        struct thermal_cooling_device *cool_dev[MAX_COOLING_DEVICE];
-        unsigned int cool_dev_size;
-        struct platform_device *exynos4_dev;
-        struct thermal_sensor_conf *sensor_conf;
-        bool bind;
-};
-
-static struct exynos_thermal_zone *th_zone;
-static void exynos_unregister_thermal(void);
-static int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
-
-/* Get mode callback functions for thermal zone */
-static int exynos_get_mode(struct thermal_zone_device *thermal,
-                        enum thermal_device_mode *mode)
-{
-        if (th_zone)
-                *mode = th_zone->mode;
-        return 0;
-}
-
-/* Set mode callback functions for thermal zone */
-static int exynos_set_mode(struct thermal_zone_device *thermal,
-                        enum thermal_device_mode mode)
-{
-        if (!th_zone->therm_dev) {
-                pr_notice("thermal zone not registered\n");
-                return 0;
-        }
-
-        mutex_lock(&th_zone->therm_dev->lock);
-
-        if (mode == THERMAL_DEVICE_ENABLED &&
-                !th_zone->sensor_conf->trip_data.trigger_falling)
-                th_zone->therm_dev->polling_delay = IDLE_INTERVAL;
-        else
-                th_zone->therm_dev->polling_delay = 0;
-
-        mutex_unlock(&th_zone->therm_dev->lock);
-
-        th_zone->mode = mode;
-        thermal_zone_device_update(th_zone->therm_dev);