This patch renames and moves include/linux/platform_data/exynos_thermal.h to drivers/thermal/samsung/exynos_tmu.h. This file movement is needed as exynos SOC's are not supporting non-DT based platforms. Also the rename is needed as this file now just contains exynos tmu driver related definations.
Acked-by: Kukjin Kim <kgene....@samsung.com> Signed-off-by: Amit Daniel Kachhap <amit.dan...@samsung.com> --- drivers/thermal/samsung/exynos_thermal_common.c | 1 - drivers/thermal/samsung/exynos_thermal_common.h | 15 +++++++++++++++ drivers/thermal/samsung/exynos_tmu.c | 2 +- .../thermal/samsung/exynos_tmu.h | 15 --------------- 4 files changed, 16 insertions(+), 17 deletions(-) rename include/linux/platform_data/exynos_thermal.h => drivers/thermal/samsung/exynos_tmu.h (88%) diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index 9a57606..dae5476 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c @@ -27,7 +27,6 @@ #include <linux/kernel.h> #include <linux/kobject.h> #include <linux/mutex.h> -#include <linux/platform_data/exynos_thermal.h> #include <linux/slab.h> #include <linux/thermal.h> #include "exynos_thermal_common.h" diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h index da2add0..1c3f8b7 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.h +++ b/drivers/thermal/samsung/exynos_thermal_common.h @@ -44,6 +44,21 @@ #define EXYNOS_ZONE_COUNT 3 +/** + * struct freq_clip_table + * @freq_clip_max: maximum frequency allowed for this cooling state. + * @temp_level: Temperature level at which the temperature clipping will + * happen. + * @mask_val: cpumask of the allowed cpu's where the clipping will take place. + * + * This structure is required to be filled and passed to the + * cpufreq_cooling_unregister function. + */ +struct freq_clip_table { + unsigned int freq_clip_max; + unsigned int temp_level; + const struct cpumask *mask_val; +}; struct thermal_trip_point_conf { int trip_val[MAX_TRIP_COUNT]; int trip_count; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 3de3e61..a02f2c9 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -30,10 +30,10 @@ #include <linux/mutex.h> #include <linux/of.h> #include <linux/platform_device.h> -#include <linux/platform_data/exynos_thermal.h> #include <linux/slab.h> #include <linux/workqueue.h> #include "exynos_thermal_common.h" +#include "exynos_tmu.h" /* Exynos generic registers */ #define EXYNOS_TMU_REG_TRIMINFO 0x0 diff --git a/include/linux/platform_data/exynos_thermal.h b/drivers/thermal/samsung/exynos_tmu.h similarity index 88% rename from include/linux/platform_data/exynos_thermal.h rename to drivers/thermal/samsung/exynos_tmu.h index da7e627..342fb1f 100644 --- a/include/linux/platform_data/exynos_thermal.h +++ b/drivers/thermal/samsung/exynos_tmu.h @@ -33,21 +33,6 @@ enum soc_type { SOC_ARCH_EXYNOS4210 = 1, SOC_ARCH_EXYNOS, }; -/** - * struct freq_clip_table - * @freq_clip_max: maximum frequency allowed for this cooling state. - * @temp_level: Temperature level at which the temperature clipping will - * happen. - * @mask_val: cpumask of the allowed cpu's where the clipping will take place. - * - * This structure is required to be filled and passed to the - * cpufreq_cooling_unregister function. - */ -struct freq_clip_table { - unsigned int freq_clip_max; - unsigned int temp_level; - const struct cpumask *mask_val; -}; /** * struct exynos_tmu_platform_data -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html