All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eduardo Valentin <eduardo.valentin@ti.com>
To: <devicetree-discuss@lists.ozlabs.org>
Cc: <wni@nvidia.com>, <l.stach@pengutronix.de>,
	<linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>,
	<lm-sensors@lm-sensors.org>,
	Eduardo Valentin <eduardo.valentin@ti.com>,
	Jean Delvare <khali@linux-fr.org>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [RESEND PATCH V1 9/9] hwmon: tmp102: expose to thermal fw via DT nodes
Date: Wed, 17 Jul 2013 11:17:28 -0400	[thread overview]
Message-ID: <1374074248-31690-10-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1374074248-31690-1-git-send-email-eduardo.valentin@ti.com>

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 | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index d7b47ab..621093b 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, unsigned 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,10 +216,22 @@ static int tmp102_probe(struct i2c_client *client,
 		goto fail_remove_sysfs;
 	}
 
+	if (of_find_node_by_name(client->dev.of_node, "thermal_zone")) {
+		tmp102->tz = thermal_zone_of_device_register(&client->dev,
+							     &client->dev,
+							     tmp102_read_temp);
+		if (IS_ERR(tmp102->tz)) {
+			status = PTR_ERR(tmp102->tz);
+			goto exit_hwmon;
+		}
+	}
+
 	dev_info(&client->dev, "initialized\n");
 
 	return 0;
 
+exit_hwmon:
+	hwmon_device_unregister(tmp102->hwmon_dev);
 fail_remove_sysfs:
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 fail_restore_config:
@@ -220,6 +244,7 @@ static int tmp102_remove(struct i2c_client *client)
 {
 	struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
+	thermal_zone_device_unregister(tmp102->tz);
 	hwmon_device_unregister(tmp102->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 
-- 
1.8.2.1.342.gfa7285d


WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Valentin <eduardo.valentin@ti.com>
To: devicetree-discuss@lists.ozlabs.org
Cc: wni@nvidia.com, l.stach@pengutronix.de,
	linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	lm-sensors@lm-sensors.org,
	Eduardo Valentin <eduardo.valentin@ti.com>,
	Jean Delvare <khali@linux-fr.org>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [RESEND PATCH V1 9/9] hwmon: tmp102: expose to thermal fw via DT nodes
Date: Wed, 17 Jul 2013 11:17:28 -0400	[thread overview]
Message-ID: <1374074248-31690-10-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1374074248-31690-1-git-send-email-eduardo.valentin@ti.com>

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 | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index d7b47ab..621093b 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, unsigned 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,10 +216,22 @@ static int tmp102_probe(struct i2c_client *client,
 		goto fail_remove_sysfs;
 	}
 
+	if (of_find_node_by_name(client->dev.of_node, "thermal_zone")) {
+		tmp102->tz = thermal_zone_of_device_register(&client->dev,
+							     &client->dev,
+							     tmp102_read_temp);
+		if (IS_ERR(tmp102->tz)) {
+			status = PTR_ERR(tmp102->tz);
+			goto exit_hwmon;
+		}
+	}
+
 	dev_info(&client->dev, "initialized\n");
 
 	return 0;
 
+exit_hwmon:
+	hwmon_device_unregister(tmp102->hwmon_dev);
 fail_remove_sysfs:
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 fail_restore_config:
@@ -220,6 +244,7 @@ static int tmp102_remove(struct i2c_client *client)
 {
 	struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
+	thermal_zone_device_unregister(tmp102->tz);
 	hwmon_device_unregister(tmp102->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 
-- 
1.8.2.1.342.gfa7285d

WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Valentin <eduardo.valentin@ti.com>
To: devicetree-discuss@lists.ozlabs.org
Cc: wni@nvidia.com, l.stach@pengutronix.de,
	linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	lm-sensors@lm-sensors.org,
	Eduardo Valentin <eduardo.valentin@ti.com>,
	Jean Delvare <khali@linux-fr.org>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [lm-sensors] [RESEND PATCH V1 9/9] hwmon: tmp102: expose to thermal fw via DT nodes
Date: Wed, 17 Jul 2013 15:17:28 +0000	[thread overview]
Message-ID: <1374074248-31690-10-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1374074248-31690-1-git-send-email-eduardo.valentin@ti.com>

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 | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index d7b47ab..621093b 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, unsigned 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,10 +216,22 @@ static int tmp102_probe(struct i2c_client *client,
 		goto fail_remove_sysfs;
 	}
 
+	if (of_find_node_by_name(client->dev.of_node, "thermal_zone")) {
+		tmp102->tz = thermal_zone_of_device_register(&client->dev,
+							     &client->dev,
+							     tmp102_read_temp);
+		if (IS_ERR(tmp102->tz)) {
+			status = PTR_ERR(tmp102->tz);
+			goto exit_hwmon;
+		}
+	}
+
 	dev_info(&client->dev, "initialized\n");
 
 	return 0;
 
+exit_hwmon:
+	hwmon_device_unregister(tmp102->hwmon_dev);
 fail_remove_sysfs:
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 fail_restore_config:
@@ -220,6 +244,7 @@ static int tmp102_remove(struct i2c_client *client)
 {
 	struct tmp102 *tmp102 = i2c_get_clientdata(client);
 
+	thermal_zone_device_unregister(tmp102->tz);
 	hwmon_device_unregister(tmp102->hwmon_dev);
 	sysfs_remove_group(&client->dev.kobj, &tmp102_attr_group);
 
-- 
1.8.2.1.342.gfa7285d


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

  parent reply	other threads:[~2013-07-17 15:20 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-17 15:17 [RESEND PATCH V1 0/9] thermal: introduce DT thermal zone build Eduardo Valentin
2013-07-17 15:17 ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17 ` Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 1/9] cpufreq: cpufreq-cpu0: add dt node parsing for 'needs-cooling' Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-25 23:28   ` Rafael J. Wysocki
2013-07-25 23:28     ` [lm-sensors] [RESEND PATCH V1 1/9] cpufreq: cpufreq-cpu0: add dt node parsing for 'needs-cooling Rafael J. Wysocki
2013-07-26 13:27     ` [RESEND PATCH V1 1/9] cpufreq: cpufreq-cpu0: add dt node parsing for 'needs-cooling' Eduardo Valentin
2013-07-26 13:27       ` [lm-sensors] [RESEND PATCH V1 1/9] cpufreq: cpufreq-cpu0: add dt node parsing for 'needs-cooling Eduardo Valentin
2013-07-26 13:27       ` [RESEND PATCH V1 1/9] cpufreq: cpufreq-cpu0: add dt node parsing for 'needs-cooling' Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 2/9] thermal: hwmon: move hwmon support to single file Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 16:29   ` [lm-sensors] " R, Durgadoss
2013-07-17 16:29     ` R, Durgadoss
2013-07-17 16:29     ` R, Durgadoss
2013-07-17 15:17 ` [RESEND PATCH V1 3/9] thermal: thermal_core: allow binding with limits on bind_params Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 16:25   ` [lm-sensors] " R, Durgadoss
2013-07-17 16:25     ` [lm-sensors] [RESEND PATCH V1 3/9] thermal: thermal_core: allow binding with limits on bind_para R, Durgadoss
2013-07-17 16:25     ` [lm-sensors] [RESEND PATCH V1 3/9] thermal: thermal_core: allow binding with limits on bind_params R, Durgadoss
2013-07-17 15:17 ` [RESEND PATCH V1 4/9] arm: dts: flag omap4430 with needs-cooling for cpu node Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 5/9] thermal: introduce device tree parser Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 6/9] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 7/9] arm: dts: add omap4430 thermal data Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-17 15:17 ` [RESEND PATCH V1 8/9] hwmon: lm75: expose to thermal fw via DT nodes Eduardo Valentin
2013-07-17 15:17   ` [lm-sensors] " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-18  5:33   ` Wei Ni
2013-07-18  5:33     ` [lm-sensors] " Wei Ni
2013-07-18  5:33     ` Wei Ni
2013-07-18 13:12     ` Eduardo Valentin
2013-07-18 13:12       ` [lm-sensors] " Eduardo Valentin
2013-07-18 13:12       ` Eduardo Valentin
2013-07-19  7:43       ` Wei Ni
2013-07-19  7:43         ` [lm-sensors] " Wei Ni
2013-07-19  7:43         ` Wei Ni
2013-07-18  7:22   ` Guenter Roeck
2013-07-18  7:22     ` [lm-sensors] " Guenter Roeck
2013-07-17 15:17 ` Eduardo Valentin [this message]
2013-07-17 15:17   ` [lm-sensors] [RESEND PATCH V1 9/9] hwmon: tmp102: " Eduardo Valentin
2013-07-17 15:17   ` Eduardo Valentin
2013-07-18  7:23   ` Guenter Roeck
2013-07-18  7:23     ` [lm-sensors] " Guenter Roeck
2013-07-17 22:09 ` [lm-sensors] [RESEND PATCH V1 0/9] thermal: introduce DT thermal zone build Guenter Roeck
2013-07-17 22:09   ` Guenter Roeck
2013-07-18 13:53   ` Eduardo Valentin
2013-07-18 13:53     ` Eduardo Valentin
2013-07-18 13:53     ` Eduardo Valentin
2013-07-18 17:18     ` Stephen Warren
2013-07-18 17:18       ` Stephen Warren
2013-07-18 21:21       ` Guenter Roeck
2013-07-18 21:21         ` Guenter Roeck
2013-07-19 13:03         ` Eduardo Valentin
2013-07-19 13:03           ` Eduardo Valentin
2013-07-19 13:03           ` Eduardo Valentin
2013-07-19 18:48         ` Stephen Warren
2013-07-19 18:48           ` Stephen Warren
2013-07-21 11:08           ` Guenter Roeck
2013-07-21 11:08             ` Guenter Roeck
2013-07-21 11:08             ` Guenter Roeck
2013-07-22 19:43             ` Stephen Warren
2013-07-22 19:43               ` Stephen Warren
2013-07-22 21:46               ` Guenter Roeck
2013-07-22 21:46                 ` Guenter Roeck
2013-07-18 21:11     ` Guenter Roeck
2013-07-18 21:11       ` Guenter Roeck
2013-07-18 21:11       ` Guenter Roeck
2013-07-19 13:38       ` Eduardo Valentin
2013-07-19 13:38         ` Eduardo Valentin
2013-07-19 13:38         ` Eduardo Valentin
2013-07-19 18:45         ` Stephen Warren
2013-07-19 18:45           ` Stephen Warren
2013-07-19 18:45           ` Stephen Warren
2013-07-19 18:56           ` Eduardo Valentin
2013-07-19 18:56             ` Eduardo Valentin
2013-07-19 18:56             ` Eduardo Valentin
2013-07-21 10:14             ` Guenter Roeck
2013-07-21 10:14               ` Guenter Roeck
2013-07-21 10:14               ` Guenter Roeck

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=1374074248-31690-10-git-send-email-eduardo.valentin@ti.com \
    --to=eduardo.valentin@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=khali@linux-fr.org \
    --cc=l.stach@pengutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.