Skip to content

Commit c48cbba

Browse files
Amit Daniel Kachhapzhang-rui
Amit Daniel Kachhap
authored and
zhang-rui
committed
hwmon: exynos4: move thermal sensor driver to driver/thermal directory
This movement is needed because the hwmon entries and corresponding sysfs interface is a duplicate of utilities already provided by driver/thermal/thermal_sys.c. The goal is to place it in thermal folder and add necessary functions to use the in-kernel thermal interfaces. Signed-off-by: Amit Daniel Kachhap <amit.kachhap@linaro.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> Cc: SangWook Ju <sw.ju@samsung.com> Cc: Durgadoss <durgadoss.r@intel.com> Cc: Len Brown <lenb@kernel.org> Cc: Jean Delvare <khali@linux-fr.org> Cc: Kyungmin Park <kmpark@infradead.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
1 parent 0236141 commit c48cbba

File tree

7 files changed

+19
-156
lines changed

7 files changed

+19
-156
lines changed

Documentation/hwmon/exynos4_tmu renamed to Documentation/thermal/exynos_thermal

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -46,36 +46,7 @@ The threshold levels are defined as follows:
4646
The threshold and each trigger_level are set
4747
through the corresponding registers.
4848

49-
When an interrupt occurs, this driver notify user space of
50-
one of four threshold levels for the interrupt
51-
through kobject_uevent_env and sysfs_notify functions.
49+
When an interrupt occurs, this driver notify kernel thermal framework
50+
with the function exynos4_report_trigger.
5251
Although an interrupt condition for level_0 can be set,
53-
it is not notified to user space through sysfs_notify function.
54-
55-
Sysfs Interface
56-
---------------
57-
name name of the temperature sensor
58-
RO
59-
60-
temp1_input temperature
61-
RO
62-
63-
temp1_max temperature for level_1 interrupt
64-
RO
65-
66-
temp1_crit temperature for level_2 interrupt
67-
RO
68-
69-
temp1_emergency temperature for level_3 interrupt
70-
RO
71-
72-
temp1_max_alarm alarm for level_1 interrupt
73-
RO
74-
75-
temp1_crit_alarm
76-
alarm for level_2 interrupt
77-
RO
78-
79-
temp1_emergency_alarm
80-
alarm for level_3 interrupt
81-
RO
52+
it can be used to synchronize the cooling action.

‎drivers/hwmon/Kconfig‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,16 +324,6 @@ config SENSORS_DA9052_ADC
324324
This driver can also be built as module. If so, the module
325325
will be called da9052-hwmon.
326326

327-
config SENSORS_EXYNOS4_TMU
328-
tristate "Temperature sensor on Samsung EXYNOS4"
329-
depends on ARCH_EXYNOS4
330-
help
331-
If you say yes here you get support for TMU (Thermal Management
332-
Unit) on SAMSUNG EXYNOS4 series of SoC.
333-
334-
This driver can also be built as a module. If so, the module
335-
will be called exynos4-tmu.
336-
337327
config SENSORS_I5K_AMB
338328
tristate "FB-DIMM AMB temperature sensor on Intel 5000 series chipsets"
339329
depends on PCI && EXPERIMENTAL

‎drivers/hwmon/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
4949
obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o
5050
obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o
5151
obj-$(CONFIG_SENSORS_EMC6W201) += emc6w201.o
52-
obj-$(CONFIG_SENSORS_EXYNOS4_TMU) += exynos4_tmu.o
5352
obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
5453
obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o
5554
obj-$(CONFIG_SENSORS_F75375S) += f75375s.o

‎drivers/thermal/Kconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,10 @@ config RCAR_THERMAL
4646
help
4747
Enable this to plug the R-Car thermal sensor driver into the Linux
4848
thermal framework
49+
50+
config EXYNOS_THERMAL
51+
tristate "Temperature sensor on Samsung EXYNOS"
52+
depends on ARCH_EXYNOS4 && THERMAL
53+
help
54+
If you say yes here you get support for TMU (Thermal Managment
55+
Unit) on SAMSUNG EXYNOS series of SoC.

‎drivers/thermal/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ obj-$(CONFIG_THERMAL) += thermal_sys.o
66
obj-$(CONFIG_CPU_THERMAL) += cpu_cooling.o
77
obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o
88
obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o
9+
obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o

drivers/hwmon/exynos4_tmu.c renamed to drivers/thermal/exynos_thermal.c

Lines changed: 4 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/*
2-
* exynos4_tmu.c - Samsung EXYNOS4 TMU (Thermal Management Unit)
2+
* exynos_thermal.c - Samsung EXYNOS TMU (Thermal Management Unit)
33
*
44
* Copyright (C) 2011 Samsung Electronics
55
* Donggeun Kim <dg77.kim@samsung.com>
6+
* Amit Daniel Kachhap <amit.kachhap@linaro.org>
67
*
78
* This program is free software; you can redistribute it and/or modify
89
* it under the terms of the GNU General Public License as published by
@@ -33,10 +34,7 @@
3334
#include <linux/io.h>
3435
#include <linux/mutex.h>
3536

36-
#include <linux/hwmon.h>
37-
#include <linux/hwmon-sysfs.h>
38-
39-
#include <linux/platform_data/exynos4_tmu.h>
37+
#include <linux/platform_data/exynos_thermal.h>
4038

4139
#define EXYNOS4_TMU_REG_TRIMINFO 0x0
4240
#define EXYNOS4_TMU_REG_CONTROL 0x20
@@ -70,7 +68,6 @@
7068

7169
struct exynos4_tmu_data {
7270
struct exynos4_tmu_platform_data *pdata;
73-
struct device *hwmon_dev;
7471
struct resource *mem;
7572
void __iomem *base;
7673
int irq;
@@ -246,8 +243,6 @@ static void exynos4_tmu_work(struct work_struct *work)
246243

247244
writel(EXYNOS4_TMU_INTCLEAR_VAL, data->base + EXYNOS4_TMU_REG_INTCLEAR);
248245

249-
kobject_uevent(&data->hwmon_dev->kobj, KOBJ_CHANGE);
250-
251246
enable_irq(data->irq);
252247

253248
clk_disable(data->clk);
@@ -264,87 +259,6 @@ static irqreturn_t exynos4_tmu_irq(int irq, void *id)
264259
return IRQ_HANDLED;
265260
}
266261

267-
static ssize_t exynos4_tmu_show_name(struct device *dev,
268-
struct device_attribute *attr, char *buf)
269-
{
270-
return sprintf(buf, "exynos4-tmu\n");
271-
}
272-
273-
static ssize_t exynos4_tmu_show_temp(struct device *dev,
274-
struct device_attribute *attr, char *buf)
275-
{
276-
struct exynos4_tmu_data *data = dev_get_drvdata(dev);
277-
int ret;
278-
279-
ret = exynos4_tmu_read(data);
280-
if (ret < 0)
281-
return ret;
282-
283-
/* convert from degree Celsius to millidegree Celsius */
284-
return sprintf(buf, "%d\n", ret * 1000);
285-
}
286-
287-
static ssize_t exynos4_tmu_show_alarm(struct device *dev,
288-
struct device_attribute *devattr, char *buf)
289-
{
290-
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
291-
struct exynos4_tmu_data *data = dev_get_drvdata(dev);
292-
struct exynos4_tmu_platform_data *pdata = data->pdata;
293-
int temp;
294-
unsigned int trigger_level;
295-
296-
temp = exynos4_tmu_read(data);
297-
if (temp < 0)
298-
return temp;
299-
300-
trigger_level = pdata->threshold + pdata->trigger_levels[attr->index];
301-
302-
return sprintf(buf, "%d\n", !!(temp > trigger_level));
303-
}
304-
305-
static ssize_t exynos4_tmu_show_level(struct device *dev,
306-
struct device_attribute *devattr, char *buf)
307-
{
308-
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
309-
struct exynos4_tmu_data *data = dev_get_drvdata(dev);
310-
struct exynos4_tmu_platform_data *pdata = data->pdata;
311-
unsigned int temp = pdata->threshold +
312-
pdata->trigger_levels[attr->index];
313-
314-
return sprintf(buf, "%u\n", temp * 1000);
315-
}
316-
317-
static DEVICE_ATTR(name, S_IRUGO, exynos4_tmu_show_name, NULL);
318-
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, exynos4_tmu_show_temp, NULL, 0);
319-
320-
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO,
321-
exynos4_tmu_show_alarm, NULL, 1);
322-
static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO,
323-
exynos4_tmu_show_alarm, NULL, 2);
324-
static SENSOR_DEVICE_ATTR(temp1_emergency_alarm, S_IRUGO,
325-
exynos4_tmu_show_alarm, NULL, 3);
326-
327-
static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO, exynos4_tmu_show_level, NULL, 1);
328-
static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, exynos4_tmu_show_level, NULL, 2);
329-
static SENSOR_DEVICE_ATTR(temp1_emergency, S_IRUGO,
330-
exynos4_tmu_show_level, NULL, 3);
331-
332-
static struct attribute *exynos4_tmu_attributes[] = {
333-
&dev_attr_name.attr,
334-
&sensor_dev_attr_temp1_input.dev_attr.attr,
335-
&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
336-
&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
337-
&sensor_dev_attr_temp1_emergency_alarm.dev_attr.attr,
338-
&sensor_dev_attr_temp1_max.dev_attr.attr,
339-
&sensor_dev_attr_temp1_crit.dev_attr.attr,
340-
&sensor_dev_attr_temp1_emergency.dev_attr.attr,
341-
NULL,
342-
};
343-
344-
static const struct attribute_group exynos4_tmu_attr_group = {
345-
.attrs = exynos4_tmu_attributes,
346-
};
347-
348262
static int __devinit exynos4_tmu_probe(struct platform_device *pdev)
349263
{
350264
struct exynos4_tmu_data *data;
@@ -418,25 +332,9 @@ static int __devinit exynos4_tmu_probe(struct platform_device *pdev)
418332
goto err_clk;
419333
}
420334

421-
ret = sysfs_create_group(&pdev->dev.kobj, &exynos4_tmu_attr_group);
422-
if (ret) {
423-
dev_err(&pdev->dev, "Failed to create sysfs group\n");
424-
goto err_clk;
425-
}
426-
427-
data->hwmon_dev = hwmon_device_register(&pdev->dev);
428-
if (IS_ERR(data->hwmon_dev)) {
429-
ret = PTR_ERR(data->hwmon_dev);
430-
dev_err(&pdev->dev, "Failed to register hwmon device\n");
431-
goto err_create_group;
432-
}
433-
434335
exynos4_tmu_control(pdev, true);
435336

436337
return 0;
437-
438-
err_create_group:
439-
sysfs_remove_group(&pdev->dev.kobj, &exynos4_tmu_attr_group);
440338
err_clk:
441339
platform_set_drvdata(pdev, NULL);
442340
clk_put(data->clk);
@@ -458,9 +356,6 @@ static int __devexit exynos4_tmu_remove(struct platform_device *pdev)
458356

459357
exynos4_tmu_control(pdev, false);
460358

461-
hwmon_device_unregister(data->hwmon_dev);
462-
sysfs_remove_group(&pdev->dev.kobj, &exynos4_tmu_attr_group);
463-
464359
clk_put(data->clk);
465360

466361
free_irq(data->irq, data);
@@ -495,7 +390,7 @@ static int exynos4_tmu_resume(struct device *dev)
495390

496391
static SIMPLE_DEV_PM_OPS(exynos4_tmu_pm,
497392
exynos4_tmu_suspend, exynos4_tmu_resume);
498-
#define EXYNOS4_TMU_PM &exynos4_tmu_pm
393+
#define EXYNOS4_TMU_PM (&exynos4_tmu_pm)
499394
#else
500395
#define EXYNOS4_TMU_PM NULL
501396
#endif

include/linux/platform_data/exynos4_tmu.h renamed to include/linux/platform_data/exynos_thermal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* exynos4_tmu.h - Samsung EXYNOS4 TMU (Thermal Management Unit)
2+
* exynos_thermal.h - Samsung EXYNOS4 TMU (Thermal Management Unit)
33
*
44
* Copyright (C) 2011 Samsung Electronics
55
* Donggeun Kim <dg77.kim@samsung.com>
@@ -19,8 +19,8 @@
1919
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2020
*/
2121

22-
#ifndef _LINUX_EXYNOS4_TMU_H
23-
#define _LINUX_EXYNOS4_TMU_H
22+
#ifndef _LINUX_EXYNOS_THERMAL_H
23+
#define _LINUX_EXYNOS_THERMAL_H
2424

2525
enum calibration_type {
2626
TYPE_ONE_POINT_TRIMMING,
@@ -80,4 +80,4 @@ struct exynos4_tmu_platform_data {
8080

8181
enum calibration_type cal_type;
8282
};
83-
#endif /* _LINUX_EXYNOS4_TMU_H */
83+
#endif /* _LINUX_EXYNOS_THERMAL_H */

0 commit comments

Comments
 (0)