From: Amit Daniel Kachhap <amit.daniel@samsung.com>
To: linux-pm@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
amit.kachhap@gmail.com, Kukjin Kim <kgene.kim@samsung.com>,
Eduardo Valentin <eduardo.valentin@ti.com>
Subject: [PATCH V4 13/30] thermal: exynos: Add support for instance based register/unregister
Date: Tue, 14 May 2013 15:28:43 +0530 [thread overview]
Message-ID: <1368525540-15034-14-git-send-email-amit.daniel@samsung.com> (raw)
In-Reply-To: <1368525540-15034-1-git-send-email-amit.daniel@samsung.com>
This code modifies the thermal driver to have multiple thermal zone
support by replacing the global thermal zone variable with device data
member of thermal_zone_device.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
drivers/thermal/samsung/exynos_thermal_common.c | 36 ++++++++++++++--------
drivers/thermal/samsung/exynos_thermal_common.h | 9 +++--
drivers/thermal/samsung/exynos_tmu.c | 15 +++++----
3 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c
index dd49c9f..2af1e3b 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -36,12 +36,11 @@ struct exynos_thermal_zone {
bool bind;
};
-static struct exynos_thermal_zone *th_zone;
-
/* Get mode callback functions for thermal zone */
static int exynos_get_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode *mode)
{
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
if (th_zone)
*mode = th_zone->mode;
return 0;
@@ -51,25 +50,26 @@ static int exynos_get_mode(struct thermal_zone_device *thermal,
static int exynos_set_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode mode)
{
- if (!th_zone->therm_dev) {
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
+ if (!th_zone) {
pr_notice("thermal zone not registered\n");
return 0;
}
- mutex_lock(&th_zone->therm_dev->lock);
+ mutex_lock(&thermal->lock);
if (mode == THERMAL_DEVICE_ENABLED &&
!th_zone->sensor_conf->trip_data.trigger_falling)
- th_zone->therm_dev->polling_delay = IDLE_INTERVAL;
+ thermal->polling_delay = IDLE_INTERVAL;
else
- th_zone->therm_dev->polling_delay = 0;
+ thermal->polling_delay = 0;
- mutex_unlock(&th_zone->therm_dev->lock);
+ mutex_unlock(&thermal->lock);
th_zone->mode = mode;
- thermal_zone_device_update(th_zone->therm_dev);
+ thermal_zone_device_update(thermal);
pr_info("thermal polling set for duration=%d msec\n",
- th_zone->therm_dev->polling_delay);
+ thermal->polling_delay);
return 0;
}
@@ -96,6 +96,8 @@ static int exynos_get_trip_type(struct thermal_zone_device *thermal, int trip,
static int exynos_get_trip_temp(struct thermal_zone_device *thermal, int trip,
unsigned long *temp)
{
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
+
if (trip < GET_TRIP(MONITOR_ZONE) || trip > GET_TRIP(PANIC_ZONE))
return -EINVAL;
@@ -122,6 +124,7 @@ static int exynos_bind(struct thermal_zone_device *thermal,
{
int ret = 0, i, tab_size, level;
struct freq_clip_table *tab_ptr, *clip_data;
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
struct thermal_sensor_conf *data = th_zone->sensor_conf;
tab_ptr = (struct freq_clip_table *)data->cooling_data.freq_data;
@@ -168,6 +171,7 @@ static int exynos_unbind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
{
int ret = 0, i, tab_size;
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
struct thermal_sensor_conf *data = th_zone->sensor_conf;
if (th_zone->bind == false)
@@ -210,6 +214,7 @@ static int exynos_unbind(struct thermal_zone_device *thermal,
static int exynos_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp)
{
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
void *data;
if (!th_zone->sensor_conf) {
@@ -229,6 +234,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal,
{
void *data;
int ret = -EINVAL;
+ struct exynos_thermal_zone *th_zone = thermal->devdata;
if (!th_zone->sensor_conf) {
pr_info("Temperature sensor not initialised\n");
@@ -276,11 +282,12 @@ static struct thermal_zone_device_ops const exynos_dev_ops = {
* This function may be called from interrupt based temperature sensor
* when threshold is changed.
*/
-void exynos_report_trigger(void)
+void exynos_report_trigger(struct thermal_sensor_conf *conf)
{
unsigned int i;
char data[10];
char *envp[] = { data, NULL };
+ struct exynos_thermal_zone *th_zone = conf->pzone_data;
if (!th_zone || !th_zone->therm_dev)
return;
@@ -321,6 +328,7 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
{
int ret;
struct cpumask mask_val;
+ struct exynos_thermal_zone *th_zone;
if (!sensor_conf || !sensor_conf->read_temperature) {
pr_err("Temperature sensor not initialised\n");
@@ -342,7 +350,7 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
th_zone->cool_dev_size++;
th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name,
- EXYNOS_ZONE_COUNT, 0, NULL, &exynos_dev_ops, NULL, 0,
+ EXYNOS_ZONE_COUNT, 0, th_zone, &exynos_dev_ops, NULL, 0,
sensor_conf->trip_data.trigger_falling ?
0 : IDLE_INTERVAL);
@@ -352,20 +360,22 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
goto err_unregister;
}
th_zone->mode = THERMAL_DEVICE_ENABLED;
+ sensor_conf->pzone_data = th_zone;
pr_info("Exynos: Kernel Thermal management registered\n");
return 0;
err_unregister:
- exynos_unregister_thermal();
+ exynos_unregister_thermal(sensor_conf);
return ret;
}
/* Un-Register with the in-kernel thermal management */
-void exynos_unregister_thermal(void)
+void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf)
{
int i;
+ struct exynos_thermal_zone *th_zone = sensor_conf->pzone_data;
if (!th_zone)
return;
diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
index 068f56c..89ae078 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.h
+++ b/drivers/thermal/samsung/exynos_thermal_common.h
@@ -77,22 +77,23 @@ struct thermal_sensor_conf {
struct thermal_trip_point_conf trip_data;
struct thermal_cooling_conf cooling_data;
void *private_data;
+ void *pzone_data;
};
/*Functions used exynos based thermal sensor driver*/
#ifdef CONFIG_EXYNOS_THERMAL_CORE
-void exynos_unregister_thermal(void);
+void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
-void exynos_report_trigger(void);
+void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
#else
static inline void
-exynos_unregister_thermal(void) { return; }
+exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) { return; }
static inline int
exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return 0; }
static inline void
-exynos_report_trigger(void) { return; }
+exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return; }
#endif /* CONFIG_EXYNOS_THERMAL_CORE */
#endif /* _EXYNOS_THERMAL_COMMON_H */
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 41e0bf9..a1dc402 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -315,6 +315,12 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
{ return -EINVAL; }
#endif/*CONFIG_THERMAL_EMULATION*/
+static struct thermal_sensor_conf exynos_sensor_conf = {
+ .name = "exynos-therm",
+ .read_temperature = (int (*)(void *))exynos_tmu_read,
+ .write_emul_temp = exynos_tmu_set_emulation,
+};
+
static void exynos_tmu_work(struct work_struct *work)
{
struct exynos_tmu_data *data = container_of(work,
@@ -323,7 +329,7 @@ static void exynos_tmu_work(struct work_struct *work)
const struct exynos_tmu_registers *reg = pdata->registers;
unsigned int val_irq;
- exynos_report_trigger();
+ exynos_report_trigger(&exynos_sensor_conf);
mutex_lock(&data->lock);
clk_enable(data->clk);
@@ -347,11 +353,6 @@ static irqreturn_t exynos_tmu_irq(int irq, void *id)
return IRQ_HANDLED;
}
-static struct thermal_sensor_conf exynos_sensor_conf = {
- .name = "exynos-therm",
- .read_temperature = (int (*)(void *))exynos_tmu_read,
- .write_emul_temp = exynos_tmu_set_emulation,
-};
#ifdef CONFIG_OF
static const struct of_device_id exynos_tmu_match[] = {
@@ -517,7 +518,7 @@ static int exynos_tmu_remove(struct platform_device *pdev)
exynos_tmu_control(pdev, false);
- exynos_unregister_thermal();
+ exynos_unregister_thermal(&exynos_sensor_conf);
clk_unprepare(data->clk);
--
1.7.1
next prev parent reply other threads:[~2013-05-14 10:05 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 9:58 [PATCH V4 00/30] thermal: exynos: Add thermal driver for exynos5440 Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 01/30] thermal: exynos: Moving exynos thermal files into samsung directory Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 02/30] thermal: exynos: Add ARCH_HAS_TMU config to know the supported soc's Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 03/30] thermal: exynos: Remove CPU_THERMAL dependency for using TMU driver Amit Daniel Kachhap
2013-05-31 15:13 ` Eduardo Valentin
2013-05-14 9:58 ` [PATCH V4 04/30] thermal: exynos: Bifurcate exynos thermal common and tmu controller code Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 05/30] thermal: exynos: Rename exynos_thermal.c to exynos_tmu.c Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 06/30] thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 07/30] thermal: exynos: Bifurcate exynos tmu driver and configuration data Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 08/30] thermal: exynos: Add missing definations and code cleanup Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 09/30] thermal: exynos: Add extra entries in the tmu platform data Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 10/30] thermal: exynos: Support thermal tripping Amit Daniel Kachhap
2013-05-17 11:56 ` jonghwa3.lee
2013-06-04 4:48 ` amit daniel kachhap
2013-05-14 9:58 ` [PATCH V4 11/30] thermal: exynos: Move register definitions from driver file to data file Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 12/30] thermal: exynos: Fix to clear only the generated interrupts Amit Daniel Kachhap
2013-05-14 9:58 ` Amit Daniel Kachhap [this message]
2013-05-14 9:58 ` [PATCH V4 14/30] thermal: exynos: Modify private_data to appropriate name driver_data Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 15/30] thermal: exynos: Return success even if no cooling data supplied Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 16/30] thermal: exynos: Make the zone handling dependent on trip count Amit Daniel Kachhap
2013-05-17 12:17 ` jonghwa3.lee
2013-05-14 9:58 ` [PATCH V4 17/30] thermal: exynos: Add support to handle many instances of TMU Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 18/30] thermal: exynos: Add TMU features to check instead of using SOC type Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 19/30] thermal: exynos: use device resource management infrastructure Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 20/30] ARM: dts: thermal: exynos4: Add documentation for Exynos SoC thermal bindings Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 21/30] thermal: exynos: Add support to access common register for multistance Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 22/30] thermal: exynos: Add support for exynos5440 TMU sensor Amit Daniel Kachhap
2013-05-18 5:23 ` jonghwa3.lee
2013-05-31 15:28 ` Eduardo Valentin
2013-06-04 4:44 ` amit daniel kachhap
2013-06-04 12:55 ` Eduardo Valentin
2013-06-05 3:20 ` amit daniel kachhap
2013-06-05 12:53 ` Eduardo Valentin
2013-06-06 6:19 ` amit daniel kachhap
2013-05-14 9:58 ` [PATCH V4 23/30] thermal: exynos: Fix to set the second point correction value properly Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 24/30] thermal: exynos: Add thermal configuration data for exynos5440 TMU sensor Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 25/30] thermal: exynos: Add a compensation logic on swapped e-fuse values Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 26/30] thermal: exynos: Add hardware mode thermal calibration support Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 27/30] Documentation: thermal: Explain the exynos thermal driver model Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 28/30] thermal: exynos: Support for TMU regulator defined at device tree Amit Daniel Kachhap
2013-05-14 9:58 ` [PATCH V4 29/30] ARM: dts: Add device tree node for exynos5440 TMU controller Amit Daniel Kachhap
2013-05-14 9:59 ` [PATCH V4 30/30] arm: exynos: enable ARCH_HAS_TMU Amit Daniel Kachhap
2013-05-15 14:44 ` [PATCH V4 00/30] thermal: exynos: Add thermal driver for exynos5440 Eduardo Valentin
2013-06-04 4:55 ` amit daniel kachhap
2013-06-04 12:57 ` Eduardo Valentin
2013-06-04 13:01 ` Eduardo Valentin
2013-06-05 3:49 ` amit daniel kachhap
2013-06-06 13:48 ` 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=1368525540-15034-14-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®