From: Amit Daniel Kachhap <amit.daniel@samsung.com>
To: linux-pm@vger.kernel.org, Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <eduardo.valentin@ti.com>
Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
amit.kachhap@gmail.com, Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH V7 06/30] thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder
Date: Mon, 24 Jun 2013 16:20:27 +0530 [thread overview]
Message-ID: <1372071051-3167-7-git-send-email-amit.daniel@samsung.com> (raw)
In-Reply-To: <1372071051-3167-1-git-send-email-amit.daniel@samsung.com>
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: 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>
---
drivers/thermal/samsung/exynos_thermal_common.c | 1 -
drivers/thermal/samsung/exynos_thermal_common.h | 16 ++++++++++++
drivers/thermal/samsung/exynos_tmu.c | 2 +-
.../thermal/samsung/exynos_tmu.h | 26 +++++--------------
4 files changed, 24 insertions(+), 21 deletions(-)
rename include/linux/platform_data/exynos_thermal.h => drivers/thermal/samsung/exynos_tmu.h (84%)
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c
index f20f458..c9edc30 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -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>
diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
index 8df1848..57ce33b 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.h
+++ b/drivers/thermal/samsung/exynos_thermal_common.h
@@ -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;
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 22a8874..6aa2fd2 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -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
diff --git a/include/linux/platform_data/exynos_thermal.h b/drivers/thermal/samsung/exynos_tmu.h
similarity index 84%
rename from include/linux/platform_data/exynos_thermal.h
rename to drivers/thermal/samsung/exynos_tmu.h
index da7e627..1857609 100644
--- a/include/linux/platform_data/exynos_thermal.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -1,8 +1,9 @@
/*
- * 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 */
--
1.7.1
next prev parent reply other threads:[~2013-06-24 10:51 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 10:50 [PATCH V7 00/30] thermal: exynos: Re-structure driver and add support for exynos5440 Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 01/30] thermal: exynos: Moving exynos thermal files into samsung directory Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 02/30] thermal: exynos: Use ARCH_HAS_BANDGAP config to know the supported soc's Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 03/30] thermal: exynos: Remove un-necessary CPU_THERMAL dependency Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 04/30] thermal: exynos: Bifurcate exynos thermal common and tmu controller code Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 05/30] thermal: exynos: Rename exynos_thermal.c to exynos_tmu.c Amit Daniel Kachhap
2013-06-24 10:50 ` Amit Daniel Kachhap [this message]
2013-06-24 10:50 ` [PATCH V7 07/30] thermal: exynos: Bifurcate exynos tmu driver and configuration data Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 08/30] thermal: exynos: Add missing definations and code cleanup Amit Daniel Kachhap
2013-06-24 15:00 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 09/30] thermal: exynos: Add extra entries in the tmu platform data Amit Daniel Kachhap
2013-06-24 15:33 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 10/30] thermal: exynos: Move register definitions from driver to data file Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 11/30] thermal: exynos: Support thermal tripping Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 12/30] thermal: exynos: Fix to clear only the generated interrupts Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 13/30] thermal: exynos: Add support for instance based register/unregister Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 14/30] thermal: exynos: Modify private_data to appropriate name driver_data Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 15/30] thermal: exynos: Return success even if no cooling data supplied Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 16/30] thermal: exynos: Make the zone handling use trip information Amit Daniel Kachhap
2013-06-24 15:41 ` Eduardo Valentin
2013-06-25 8:33 ` amit daniel kachhap
2013-06-25 11:39 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-25 13:36 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 17/30] thermal: exynos: Remove non DT based support Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 18/30] thermal: exynos: Add support to handle many instances of TMU Amit Daniel Kachhap
2013-06-24 15:50 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 19/30] thermal: exynos: Add TMU features to check instead of using SOC type Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 20/30] thermal: exynos: use device resource management infrastructure Amit Daniel Kachhap
2013-06-25 11:41 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 21/30] thermal: exynos: Add support to access common register for multistance Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 22/30] thermal: exynos: Add driver support for exynos5440 TMU sensor Amit Daniel Kachhap
2013-06-24 19:43 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 23/30] thermal: exynos: Add thermal configuration data " Amit Daniel Kachhap
2013-06-24 16:37 ` Eduardo Valentin
2013-06-26 1:24 ` Jungseok Lee
2013-08-07 9:53 ` Naveen Krishna Ch
2013-06-24 10:50 ` [PATCH V7 24/30] thermal: exynos: Fix to set the second point correction value Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 25/30] thermal: exynos: Add hardware mode thermal calibration support Amit Daniel Kachhap
2013-06-24 19:39 ` Eduardo Valentin
2013-06-25 9:12 ` amit daniel kachhap
2013-06-25 11:46 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-25 13:38 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 26/30] thermal: exynos: Support for TMU regulator defined at device tree Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 27/30] ARM: dts: thermal: exynos: Add documentation for Exynos SoC thermal bindings Amit Daniel Kachhap
2013-06-24 17:05 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 28/30] Documentation: thermal: Explain the exynos thermal driver model Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 29/30] ARM: dts: Add device tree node for exynos5440 TMU controller Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 30/30] arm: exynos: enable ARCH_HAS_BANDGAP Amit Daniel Kachhap
2013-06-24 17:11 ` Eduardo Valentin
2013-06-24 17:13 ` [PATCH V7 00/30] thermal: exynos: Re-structure driver and add support for exynos5440 Kukjin Kim
2013-06-24 19:51 ` Eduardo Valentin
2013-06-25 11:53 ` amit daniel kachhap
2013-06-28 5:19 ` amit daniel kachhap
2013-06-28 5:30 ` Zhang, Rui
2013-07-08 23:13 ` Eduardo Valentin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372071051-3167-7-git-send-email-amit.daniel@samsung.com \
--to=amit.daniel@samsung.com \
--cc=amit.kachhap@gmail.com \
--cc=eduardo.valentin@ti.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®