From 7cb4d6faa293308442349bf7e9a121fbbe16cf2a Mon Sep 17 00:00:00 2001 From: Hyeonseong Gil Date: Fri, 22 Jul 2016 17:56:51 +0900 Subject: [PATCH] [COMMON] thermal: samsung: logging exynos_ss_thermal Logging temperature and cpu max frequency on exynos_ss Resolved migration conflicts from kernel 4.9 to 4.14. - rename cpufreq_device -> cpufreq_cdev - rename cool_dev -> cdev Change-Id: If30e0780800f5ec3a56684750ab6c3c88dabae91 Signed-off-by: Hyeonseong Gil --- drivers/thermal/cpu_cooling.c | 5 ++++- drivers/thermal/samsung/exynos_tmu.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 0a3880b59d6b..796ab1ca3ea5 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -149,8 +150,10 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, */ clipped_freq = cpufreq_cdev->clipped_freq; - if (policy->max > clipped_freq) + if (policy->max > clipped_freq) { cpufreq_verify_within_limits(policy, 0, clipped_freq); + exynos_ss_thermal(NULL, 0, cpufreq_cdev->cdev->type, clipped_freq); + } break; } mutex_unlock(&cooling_list_lock); diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 74ab5ef687f3..eb5f482ffd47 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -660,6 +661,7 @@ static int exynos_get_temp(void *p, int *temp) mutex_unlock(&thermal_suspend_lock); + exynos_ss_thermal(data->pdata, *temp / 1000, data->tmu_name, 0); return 0; } -- 2.20.1