linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eduardo Valentin <eduardo.valentin@ti.com>
To: <swarren@wwwdotorg.org>, <pawel.moll@arm.com>,
	<mark.rutland@arm.com>, <ian.campbell@citrix.com>,
	<rob.herring@calxeda.com>, <khali@linux-fr.org>,
	<linux@roeck-us.net>
Cc: <rui.zhang@intel.com>, <wni@nvidia.com>,
	<grant.likely@linaro.org>, <durgadoss.r@intel.com>,
	<linux-pm@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<lm-sensors@lm-sensors.org>, <linux-kernel@vger.kernel.org>,
	Eduardo Valentin <eduardo.valentin@ti.com>
Subject: [PATCHv2 06/16] hwmon: tmp102: expose to thermal fw via DT nodes
Date: Tue, 17 Sep 2013 18:34:05 -0400	[thread overview]
Message-ID: <1379457245-17810-1-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <523643D4.30208@roeck-us.net>

This patch adds to tmp102 temperature sensor the possibility
to expose itself as thermal zone device, registered on the
thermal framework.

The thermal zone is built only if a device tree node
describing a thermal zone for this sensor is present
inside the tmp102 DT node. Otherwise, the driver behavior
will be the same.

Cc: Jean Delvare <khali@linux-fr.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: lm-sensors@lm-sensors.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
 drivers/hwmon/tmp102.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

---

Guenter,

Here is a version without the warnings, as requested.

Eduardo

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index d7b47ab..dc96598 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -27,6 +27,8 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/jiffies.h>
+#include <linux/thermal.h>
+#include <linux/of.h>
 
 #define	DRIVER_NAME "tmp102"
 
@@ -50,6 +52,7 @@
 
 struct tmp102 {
 	struct device *hwmon_dev;
+	struct thermal_zone_device *tz;
 	struct mutex lock;
 	u16 config_orig;
 	unsigned long last_update;
@@ -93,6 +96,15 @@ static struct tmp102 *tmp102_update_device(struct i2c_client *client)
 	return tmp102;
 }
 
+static int tmp102_read_temp(void *dev, long *temp)
+{
+	struct tmp102 *tmp102 = tmp102_update_device(to_i2c_client(dev));
+
+	*temp = tmp102->temp[0];
+
+	return 0;
+}
+
 static ssize_t tmp102_show_temp(struct device *dev,
 				struct device_attribute *attr,
 				char *buf)
@@ -204,6 +216,12 @@ static int tmp102_probe(struct i2c_client *client,
 		goto fail_remove_sysfs;
 	}
 
+	tmp102->tz = thermal_zone_of_sensor_register(&client->dev, 0,
+						     &client->dev,
+						     tmp102_read_temp, NULL);
+	if (IS_ERR(tmp102->tz))
+		tmp102->tz = NULL;
+
 	dev_info(&client->dev, "initialized\n");
 
 	return 0;
@@ -220,6 +238,8 @@ static int tmp102_remove(struct i2c_client *client)
 {
 	struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
+	/* thermal zone life cycle is not our responsibility */
+	thermal_zone_of_sensor_unregister(&client->dev, tmp102->tz);
 	hwmon_device_unregister(tmp102->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 
-- 
1.8.2.1.342.gfa7285d


  parent reply	other threads:[~2013-09-17 22:35 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-15 22:02 [PATCH 00/16] device thermal limits represented in device tree nodes (v3) Eduardo Valentin
2013-09-15 22:02 ` [PATCH 01/16] drivers: thermal: allow registering without .get_temp Eduardo Valentin
2013-09-15 22:02 ` [PATCH 02/16] drivers: thermal: introduce device tree parser Eduardo Valentin
2013-09-18 16:03   ` [PATCHv2 " Eduardo Valentin
2013-09-18 17:08     ` Guenter Roeck
2013-09-18 18:54       ` Eduardo Valentin
2013-09-18 19:02         ` [PATCHv3 " Eduardo Valentin
2013-09-18 19:11           ` Joe Perches
2013-09-18 19:44             ` Eduardo Valentin
2013-09-18 19:59               ` Joe Perches
2013-09-18 20:04                 ` Eduardo Valentin
2013-09-18 20:31           ` [PATCHv4 " Eduardo Valentin
2013-09-18 20:44             ` Joe Perches
2013-09-18 20:52               ` Eduardo Valentin
2013-09-18 21:00                 ` Joe Perches
2013-09-18 21:07                   ` Eduardo Valentin
2013-09-18 20:57             ` [PATCHv5 " Eduardo Valentin
2013-09-18 21:04               ` Joe Perches
2013-09-18 21:22                 ` Eduardo Valentin
2013-09-18 21:35               ` [PATCHv6 " Eduardo Valentin
2013-09-23 10:40                 ` Mark Rutland
2013-09-23 15:39                   ` Eduardo Valentin
2013-09-24  8:11                   ` Hongbo Zhang
2013-09-24 15:50                     ` Eduardo Valentin
2013-09-25  5:39                       ` Hongbo Zhang
2013-09-25 14:23                         ` Eduardo Valentin
2013-09-24 21:33                   ` Eduardo Valentin
2013-09-30 15:40                     ` Mark Rutland
2013-09-25  7:13                 ` Hongbo Zhang
2013-09-25 14:15                   ` Eduardo Valentin
2013-10-08  8:45                     ` Hongbo Zhang
2013-10-08 14:25                       ` Eduardo Valentin
2013-09-15 22:02 ` [PATCH 03/16] drivers: thermal: cpu_cooling: introduce of_cpufreq_cooling_register Eduardo Valentin
2013-09-15 22:02 ` [PATCH 04/16] cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties Eduardo Valentin
2013-09-15 22:02 ` [PATCH 05/16] hwmon: lm75: expose to thermal fw via DT nodes Eduardo Valentin
2013-09-15 23:22   ` Guenter Roeck
2013-09-17 22:35     ` [PATCHv2 " Eduardo Valentin
2013-09-18 16:21       ` [PATCHv3 " Eduardo Valentin
2013-09-21 18:06         ` Guenter Roeck
2013-09-21 23:30           ` Eduardo Valentin
2013-09-21 23:56             ` Guenter Roeck
2013-09-22  0:23               ` Eduardo Valentin
2013-09-22  2:24                 ` Guenter Roeck
2013-09-15 22:02 ` [PATCH 06/16] hwmon: tmp102: " Eduardo Valentin
2013-09-15 23:33   ` Guenter Roeck
2013-09-17 22:29     ` Eduardo Valentin
2013-09-17 22:34     ` Eduardo Valentin [this message]
2013-09-18 11:06       ` [PATCHv2 " Guenter Roeck
2013-09-18 14:17         ` Eduardo Valentin
2013-09-18 16:23       ` [PATCH " Eduardo Valentin
2013-09-21 18:07         ` Guenter Roeck
2013-09-15 22:02 ` [PATCH 07/16] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
2013-09-15 22:02 ` [PATCH 08/16] arm: dts: add omap4 CPU thermal data Eduardo Valentin
2013-09-15 22:02 ` [PATCH 09/16] arm: dts: add omap4430 " Eduardo Valentin
2013-09-15 22:02 ` [PATCH 10/16] arm: dts: add omap4460 " Eduardo Valentin
2013-09-15 22:02 ` [PATCH 11/16] arm: dts: add cooling properties on omap4430 cpu node Eduardo Valentin
2013-09-15 22:02 ` [PATCH 12/16] arm: dts: add cooling properties on omap4460 " Eduardo Valentin
2013-09-15 22:02 ` [PATCH 13/16] arm: dts: add omap5 GPU thermal data Eduardo Valentin
2013-09-15 22:02 ` [PATCH 14/16] arm: dts: add omap5 CORE " Eduardo Valentin
2013-09-15 22:02 ` [PATCH 15/16] arm: dts: add omap5 " Eduardo Valentin
2013-09-15 22:02 ` [PATCH 16/16] arm: dts: add cooling properties on omap5 cpu node 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=1379457245-17810-1-git-send-email-eduardo.valentin@ti.com \
    --to=eduardo.valentin@ti.com \
    --cc=devicetree@vger.kernel.org \
    --cc=durgadoss.r@intel.com \
    --cc=grant.likely@linaro.org \
    --cc=ian.campbell@citrix.com \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=rui.zhang@intel.com \
    --cc=swarren@wwwdotorg.org \
    --cc=wni@nvidia.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;
as well as URLs for NNTP newsgroup(s).