linux-pm.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,
	linux@roeck-us.net, rui.zhang@intel.com, wni@nvidia.com
Cc: 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>,
	Jean Delvare <khali@linux-fr.org>
Subject: [PATCHv4 07/18] hwmon: lm75: expose to thermal fw via DT nodes
Date: Thu, 26 Sep 2013 23:13:14 -0400	[thread overview]
Message-ID: <1380251605-3804-8-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1380251605-3804-1-git-send-email-eduardo.valentin@ti.com>

This patch adds to lm75 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 lm75 DT node. Otherwise, the driver behavior
will be the same.

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

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index c03b490..1d3600a 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -27,6 +27,8 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
+#include <linux/thermal.h>
 #include "lm75.h"
 
 
@@ -70,6 +72,7 @@ static const u8 LM75_REG_TEMP[3] = {
 /* Each client has this additional data */
 struct lm75_data {
 	struct device		*hwmon_dev;
+	struct thermal_zone_device	*tz;
 	struct mutex		update_lock;
 	u8			orig_conf;
 	u8			resolution;	/* In bits, between 9 and 12 */
@@ -90,22 +93,36 @@ static struct lm75_data *lm75_update_device(struct device *dev);
 
 /*-----------------------------------------------------------------------*/
 
+static inline long lm75_reg_to_mc(s16 temp, u8 resolution)
+{
+	return ((temp >> (16 - resolution)) * 1000) >> (resolution - 8);
+}
+
 /* sysfs attributes for hwmon */
 
+static int lm75_read_temp(void *dev, long *temp)
+{
+	struct lm75_data *data = lm75_update_device(dev);
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	*temp = lm75_reg_to_mc(data->temp[0], data->resolution);
+
+	return 0;
+}
+
 static ssize_t show_temp(struct device *dev, struct device_attribute *da,
 			 char *buf)
 {
 	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
 	struct lm75_data *data = lm75_update_device(dev);
-	long temp;
 
 	if (IS_ERR(data))
 		return PTR_ERR(data);
 
-	temp = ((data->temp[attr->index] >> (16 - data->resolution)) * 1000)
-	       >> (data->resolution - 8);
-
-	return sprintf(buf, "%ld\n", temp);
+	return sprintf(buf, "%ld\n", lm75_reg_to_mc(data->temp[attr->index],
+						    data->resolution));
 }
 
 static ssize_t set_temp(struct device *dev, struct device_attribute *da,
@@ -271,6 +288,13 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		goto exit_remove;
 	}
 
+	data->tz = thermal_zone_of_sensor_register(&client->dev,
+						   0,
+						   &client->dev,
+						   lm75_read_temp, NULL);
+	if (IS_ERR(data->tz))
+		data->tz = NULL;
+
 	dev_info(&client->dev, "%s: sensor '%s'\n",
 		 dev_name(data->hwmon_dev), client->name);
 
@@ -285,6 +309,7 @@ static int lm75_remove(struct i2c_client *client)
 {
 	struct lm75_data *data = i2c_get_clientdata(client);
 
+	thermal_zone_of_sensor_unregister(&client->dev, data->tz);
 	hwmon_device_unregister(data->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &lm75_group);
 	lm75_write_value(client, LM75_REG_CONF, data->orig_conf);
-- 
1.8.2.1.342.gfa7285d

  parent reply	other threads:[~2013-09-27  3:13 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-27  3:13 [PATCHv4 00/18] device thermal limits represented in device tree nodes (v4) Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 01/18] thermal: allow registering without .get_temp Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 02/18] thermal: core: allow binding via .bind when tzp is present Eduardo Valentin
2013-11-06  2:56   ` Wei Ni
2013-09-27  3:13 ` [PATCHv7 03/18] thermal: introduce device tree parser Eduardo Valentin
2013-09-30 15:36   ` Mark Rutland
     [not found]     ` <20130930153614.GA22259-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2013-09-30 20:47       ` Eduardo Valentin
     [not found]   ` <1380251605-3804-4-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-10-01  2:39     ` [PATCHv8 " Eduardo Valentin
2013-10-07 20:51       ` Mark Rutland
2013-10-08 14:59         ` Eduardo Valentin
2013-11-05 18:08         ` Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 05/18] thermal: cpu_cooling: introduce of_cpufreq_cooling_register Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 06/18] cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties Eduardo Valentin
2013-09-27  3:13 ` Eduardo Valentin [this message]
2013-09-27  3:13 ` [PATCHv4 09/18] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 10/18] arm: dts: add omap4 CPU thermal data Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 11/18] arm: dts: add omap4430 " Eduardo Valentin
2013-09-27 12:24   ` Nishanth Menon
2013-09-27 13:20     ` Eduardo Valentin
2013-09-27 13:26       ` Nishanth Menon
2013-09-27 13:42         ` Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 12/18] arm: dts: add omap4460 " Eduardo Valentin
     [not found] ` <1380251605-3804-1-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-09-27  3:13   ` [PATCHv4 04/18] thermal: core: introduce thermal_of_cooling_device_register Eduardo Valentin
2013-09-27  3:13   ` [PATCHv4 08/18] hwmon: tmp102: expose to thermal fw via DT nodes Eduardo Valentin
2013-09-27  3:13   ` [PATCHv4 13/18] arm: dts: add cooling properties on omap4430 cpu node Eduardo Valentin
2013-09-27  3:13   ` [PATCHv4 17/18] arm: dts: add omap5 thermal data Eduardo Valentin
2013-09-27  3:13   ` [PATCHv4 18/18] arm: dts: add cooling properties on omap5 cpu node Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 14/18] arm: dts: add cooling properties on omap4460 " Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 15/18] arm: dts: add omap5 GPU thermal data Eduardo Valentin
2013-09-27  3:13 ` [PATCHv4 16/18] arm: dts: add omap5 CORE " Eduardo Valentin
2013-09-27  3:15 ` [PATCHv4 00/18] device thermal limits represented in device tree nodes (v4) 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=1380251605-3804-8-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).