From: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: durgadoss.r-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
MLongnecker-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org,
linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TZX6JHB/w77yyCwEArCW2h5@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Subject: [RFC PATCH 6/9] hwmon: (lm90) Register to the thermal framework
Date: Mon, 18 Feb 2013 19:30:28 +0800 [thread overview]
Message-ID: <1361187031-3679-7-git-send-email-wni@nvidia.com> (raw)
In-Reply-To: <1361187031-3679-1-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Register the remote sensor to the thermal framework.
It can support to show the temperature and read/write threshold.
Signed-off-by: Wei Ni <wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
arch/arm/boot/dts/tegra30-cardhu.dtsi | 1 +
drivers/hwmon/lm90.c | 182 ++++++++++++++++++++++++++++++++-
2 files changed, 182 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 15ad1ad..3f6ab89 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -279,6 +279,7 @@
reg = <0x4c>;
interrupt-parent = <&gpio>;
interrupts = <226 0x08>; /* gpio PCC2 */
+ #sensor-cells = <1>;
};
};
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index de5a476..0abdedc 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -91,6 +91,7 @@
#include <linux/sysfs.h>
#include <linux/interrupt.h>
#include <linux/of_irq.h>
+#include <linux/thermal.h>
/*
* Addresses to scan
@@ -182,6 +183,15 @@ enum chips { lm90, adm1032, lm99, lm86, max6657, max6659, adt7461, max6680,
#define LM90_HAVE_BROKEN_ALERT (1 << 7) /* Broken alert */
/*
+ * Thermal framework
+ */
+enum lm90_thresholds {
+ LM90_LOW_THRESHOLDS = 0, /* threshold 0: low limits */
+ LM90_HIGH_THRESHOLDS, /* threshold 1: high limits */
+ LM90_NUM_THRESHOLDS
+};
+
+/*
* Driver data (common to all clients)
*/
@@ -377,6 +387,9 @@ struct lm90_data {
s16 temp11[TEMP11_REG_NUM];
u8 temp_hyst;
u16 alarms; /* bitvector (upper 8 bits for max6695/96) */
+
+ struct thermal_sensor *ts_remote;
+ struct thermal_sensor *ts_local;
};
/*
@@ -1493,12 +1506,151 @@ static irqreturn_t lm90_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static int lm90_read_remote_temp(struct thermal_sensor *ts, long *temp)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+
+ _show_temp11(dev, TEMP11_REMOTE_TEMP, (int *)temp);
+
+ return 0;
+}
+
+static int lm90_read_remote_threshold(struct thermal_sensor *ts, int th_index,
+ long *val)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+ int index;
+
+ switch (th_index) {
+ case LM90_LOW_THRESHOLDS:
+ /* remote low limit */
+ index = TEMP11_REMOTE_LOW;
+ break;
+ case LM90_HIGH_THRESHOLDS:
+ /* remote high limit */
+ index = TEMP11_REMOTE_HIGH;
+ break;
+ default:
+ dev_err(dev, "read remote threshold failed.\n");
+ return -EINVAL;
+ }
+
+ _show_temp11(dev, index, (int *)val);
+
+ return 0;
+}
+
+static int lm90_write_remote_threshold(struct thermal_sensor *ts, int th_index,
+ long val)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+ int nr, index;
+
+ switch (th_index) {
+ case LM90_LOW_THRESHOLDS:
+ /* remote low limit */
+ nr = NR_CHAN_0_REMOTE_LOW;
+ index = TEMP11_REMOTE_LOW;
+ break;
+ case LM90_HIGH_THRESHOLDS:
+ /* remote high limit */
+ nr = NR_CHAN_0_REMOTE_HIGH;
+ index = TEMP11_REMOTE_HIGH;
+ break;
+ default:
+ dev_err(dev, "write remote threshold failed.\n");
+ return -EINVAL;
+ }
+
+ _set_temp11(dev, nr, index, val);
+
+ return 0;
+}
+
+static struct thermal_sensor_ops remote_ops = {
+ .get_temp = lm90_read_remote_temp,
+ .get_threshold = lm90_read_remote_threshold,
+ .set_threshold = lm90_write_remote_threshold,
+};
+
+static int lm90_read_local_temp(struct thermal_sensor *ts, long *temp)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+
+ _show_temp11(dev, TEMP11_LOCAL_TEMP, (int *)temp);
+
+ return 0;
+}
+
+static int lm90_read_local_threshold(struct thermal_sensor *ts, int th_index,
+ long *val)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+ int index;
+
+ switch (th_index) {
+ case LM90_LOW_THRESHOLDS:
+ /* local low limit */
+ index = TEMP8_LOCAL_LOW;
+ break;
+ case LM90_HIGH_THRESHOLDS:
+ /* local high limit */
+ index = TEMP8_LOCAL_HIGH;
+ break;
+ default:
+ dev_err(dev, "read local threshold failed.\n");
+ return -EINVAL;
+ }
+
+ _show_temp8(dev, index, (int *)val);
+
+ return 0;
+}
+
+static int lm90_write_local_threshold(struct thermal_sensor *ts, int th_index,
+ long val)
+{
+ struct i2c_client *client = ts->devdata;
+ struct device *dev = &client->dev;
+ int index;
+
+ switch (th_index) {
+ case LM90_LOW_THRESHOLDS:
+ /* local low limit */
+ index = TEMP8_LOCAL_LOW;
+ break;
+ case LM90_HIGH_THRESHOLDS:
+ /* local high limit */
+ index = TEMP8_LOCAL_HIGH;
+ break;
+ default:
+ dev_err(dev, "write local threshold failed.\n");
+ return -EINVAL;
+ }
+
+ _set_temp8(dev, index, val);
+
+ return 0;
+}
+
+static struct thermal_sensor_ops local_ops = {
+ .get_temp = lm90_read_local_temp,
+ .get_threshold = lm90_read_local_threshold,
+ .set_threshold = lm90_write_local_threshold,
+};
+
static int lm90_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
struct i2c_adapter *adapter = to_i2c_adapter(dev->parent);
struct lm90_data *data;
+ struct node_args np_args;
int err;
data = devm_kzalloc(&client->dev, sizeof(struct lm90_data), GFP_KERNEL);
@@ -1576,12 +1728,38 @@ static int lm90_probe(struct i2c_client *client,
"lm90", data);
if (err < 0) {
dev_err(dev, "cannot request interrupt\n");
- goto exit_remove_files;
+ goto exit_unregister_hwmon;
}
}
+ np_args.np = dev->of_node;
+ np_args.index = 0;
+ data->ts_remote = thermal_sensor_register("lm90_remote",
+ LM90_NUM_THRESHOLDS,
+ &np_args,
+ &remote_ops, client);
+ if (IS_ERR(data->ts_remote)) {
+ dev_err(dev, "cannot register sensor to thermal framework\n");
+ err = -EINVAL;
+ goto exit_unregister_hwmon;
+ }
+
+ np_args.index = 1;
+ data->ts_local = thermal_sensor_register("lm90_local",
+ LM90_NUM_THRESHOLDS,
+ &np_args,
+ &local_ops, client);
+
+ if (IS_ERR(data->ts_local)) {
+ dev_err(dev, "cannot register sensor to thermal framework\n");
+ err = -EINVAL;
+ goto exit_unregister_hwmon;
+ }
+
return 0;
+exit_unregister_hwmon:
+ hwmon_device_unregister(data->hwmon_dev);
exit_remove_files:
lm90_remove_files(client, data);
exit_restore:
@@ -1594,6 +1772,8 @@ static int lm90_remove(struct i2c_client *client)
struct lm90_data *data = i2c_get_clientdata(client);
free_irq(client->irq, data);
+ thermal_sensor_unregister(data->ts_remote);
+ thermal_sensor_unregister(data->ts_local);
hwmon_device_unregister(data->hwmon_dev);
lm90_remove_files(client, data);
lm90_restore_conf(client, data);
--
1.7.9.5
next prev parent reply other threads:[~2013-02-18 11:30 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-18 11:30 [RFC PATCH 0/9] Support for tegra30 thermal Wei Ni
2013-02-18 11:30 ` [RFC PATCH 2/9] hwmon: (lm90) split set&show temp as common codes Wei Ni
2013-02-18 22:29 ` Matthew Longnecker
2013-02-19 9:48 ` Wei Ni
2013-02-19 3:31 ` [lm-sensors] " Guenter Roeck
[not found] ` <20130219033144.GA25610-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2013-02-19 10:00 ` Wei Ni
2013-02-19 22:56 ` Stephen Warren
[not found] ` <51240331.7080604-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-20 12:31 ` Wei Ni
2013-02-18 11:30 ` [RFC PATCH 4/9] hwmon: (lm90) use macros for the indexes of temp8 and temp11 Wei Ni
2013-02-19 5:39 ` Alex Courbot
[not found] ` <5123100A.9050604-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 9:58 ` Wei Ni
2013-02-19 23:02 ` Stephen Warren
[not found] ` <51240497.8010909-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-20 10:29 ` Wei Ni
2013-02-18 11:30 ` [RFC PATCH 7/9] thermal: tegra30: add tegra30 thermal driver Wei Ni
2013-02-19 23:48 ` Stephen Warren
2013-02-20 12:23 ` Wei Ni
2013-02-19 23:56 ` Russell King - ARM Linux
[not found] ` <20130219235629.GU17833-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2013-02-20 12:29 ` Wei Ni
[not found] ` <1361187031-3679-1-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-18 11:30 ` [RFC PATCH 1/9] ARM: dt: t30 cardhu: add dt entry for lm90 Wei Ni
[not found] ` <1361187031-3679-2-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 3:28 ` Alex Courbot
2013-02-19 9:52 ` Wei Ni
[not found] ` <5122F162.9030103-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 22:48 ` Stephen Warren
2013-02-18 11:30 ` [RFC PATCH 3/9] hwmon: (lm90) add support to handle irq Wei Ni
[not found] ` <1361187031-3679-4-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 3:34 ` [lm-sensors] " Guenter Roeck
2013-02-19 10:43 ` Wei Ni
2013-02-19 23:00 ` Stephen Warren
2013-02-20 3:27 ` Alex Courbot
[not found] ` <5124429B.2000404-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-20 10:27 ` Wei Ni
2013-02-18 11:30 ` [RFC PATCH 5/9] Thermal: Support using dt node to get sensor Wei Ni
[not found] ` <1361187031-3679-6-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 23:12 ` Stephen Warren
[not found] ` <512406F0.4080708-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-02-20 10:36 ` Wei Ni
2013-02-18 11:30 ` Wei Ni [this message]
2013-02-19 3:42 ` [lm-sensors] [RFC PATCH 6/9] hwmon: (lm90) Register to the thermal framework Guenter Roeck
[not found] ` <20130219034205.GC25610-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2013-02-19 10:47 ` Wei Ni
2013-02-19 5:22 ` Alex Courbot
2013-02-19 10:58 ` Wei Ni
[not found] ` <1361187031-3679-7-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 23:18 ` Stephen Warren
2013-02-20 10:40 ` Wei Ni
2013-02-18 11:30 ` [RFC PATCH 8/9] ARM: dt: t30 cardhu: add dt entry for thermal driver Wei Ni
2013-02-19 3:42 ` Alex Courbot
2013-02-19 9:56 ` Wei Ni
[not found] ` <1361187031-3679-9-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-19 23:28 ` Stephen Warren
2013-02-20 11:53 ` Wei Ni
[not found] ` <5124B934.3020900-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-02-20 17:18 ` Stephen Warren
2013-02-18 11:30 ` [RFC PATCH 9/9] ARM: tegra: defconfig: enable thermal framework Wei Ni
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=1361187031-3679-7-git-send-email-wni@nvidia.com \
--to=wni-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
--cc=MLongnecker-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
--cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
--cc=durgadoss.r-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TZX6JHB/w77yyCwEArCW2h5@public.gmane.org \
--cc=linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org \
--cc=rui.zhang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
/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).