Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c1836a6 authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Eduardo Valentin
Browse files

thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder 



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 and this file now just contains
exynos tmu driver related definations.
Also struct freq_clip_table is now moved to exynos_thermal_common.c as it fixes
the compilation issue occuring because now this new tmu header file is included
in tmu driver c file and not in the common thermal header file.

Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
parent 59dfa54c

drivers/thermal/samsung/exynos_thermal_common.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <linux/cpu_cooling.h>

#include <linux/err.h>

#include <linux/platform_data/exynos_thermal.h>

#include <linux/slab.h>

#include <linux/thermal.h>

drivers/thermal/samsung/exynos_thermal_common.h

+16 −0
Original line number Diff line number Diff line
@@ -44,6 +44,22 @@ 


#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;

drivers/thermal/samsung/exynos_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#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"

#include "exynos_tmu.h"



/* Exynos generic registers */

#define EXYNOS_TMU_REG_TRIMINFO		0x0

include/linux/platform_data/exynos_thermal.h→drivers/thermal/samsung/exynos_tmu.h

+7 −19
Original line number Diff line number Diff line 
/*

 * exynos_thermal.h - Samsung EXYNOS TMU (Thermal Management Unit)

 * exynos_tmu.h - Samsung EXYNOS TMU (Thermal Management Unit)

 *

 *  Copyright (C) 2011 Samsung Electronics

 *  Donggeun Kim <dg77.kim@samsung.com>

 *  Amit Daniel Kachhap <amit.daniel@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -19,10 +20,12 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef _LINUX_EXYNOS_THERMAL_H

#define _LINUX_EXYNOS_THERMAL_H

#ifndef _EXYNOS_TMU_H

#define _EXYNOS_TMU_H

#include <linux/cpu_cooling.h>



#include "exynos_thermal_common.h"



enum calibration_type {

	TYPE_ONE_POINT_TRIMMING,

	TYPE_TWO_POINT_TRIMMING,
@@ -33,21 +36,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
@@ -116,4 +104,4 @@ struct exynos_tmu_platform_data { 
	struct freq_clip_table freq_tab[4];

	unsigned int freq_tab_count;

};

#endif /* _LINUX_EXYNOS_THERMAL_H */
 
#endif /* _EXYNOS_TMU_H */