From: Krzysztof Adamski <krzysztof.adamski@nokia.com>
To: Guenter Roeck <linux@roeck-us.net>, Jean Delvare <jdelvare@suse.com>
Cc: Rob Herring <robh+dt@kernel.org>,
linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org,
Przemyslaw Cencner <przemyslaw.cencner@nokia.com>
Subject: [PATCH v2 08/10] hwmon: (tmp421) support HWMON_T_ENABLE
Date: Fri, 24 Sep 2021 11:43:13 +0200 [thread overview]
Message-ID: <b92b0feafcdac34f606f052ced27f4c025c5ca45.1632473318.git.krzysztof.adamski@nokia.com> (raw)
In-Reply-To: <cover.1632473318.git.krzysztof.adamski@nokia.com>
Since the recent patches added possibility of disabling sensor channels
via DT, it only make sense to allow controlling that from userspace via
HWMON_T_ENABLE mechanism. This patches adds support for that.
Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---
drivers/hwmon/tmp421.c | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 4934ce13afb4..3f3e5d6c9e3d 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -190,23 +190,28 @@ static int tmp421_read(struct device *dev, enum hwmon_sensor_types type,
{
struct tmp421_data *tmp421 = tmp421_update_device(dev);
- if (!tmp421->channel[channel].enabled)
- return -ENODATA;
-
switch (attr) {
case hwmon_temp_input:
+ if (!tmp421->channel[channel].enabled)
+ return -ENODATA;
+
if (tmp421->config & TMP421_CONFIG_RANGE)
*val = temp_from_u16(tmp421->channel[channel].temp);
else
*val = temp_from_s16(tmp421->channel[channel].temp);
return 0;
case hwmon_temp_fault:
+ if (!tmp421->channel[channel].enabled)
+ return -ENODATA;
/*
* The OPEN bit signals a fault. This is bit 0 of the temperature
* register (low byte).
*/
*val = tmp421->channel[channel].temp & 0x01;
return 0;
+ case hwmon_temp_enable:
+ *val = tmp421->channel[channel].enabled;
+ return 0;
default:
return -EOPNOTSUPP;
}
@@ -223,6 +228,24 @@ static int tmp421_read_string(struct device *dev, enum hwmon_sensor_types type,
return 0;
}
+static int tmp421_write(struct device *dev, enum hwmon_sensor_types type,
+ u32 attr, int channel, long val)
+{
+ struct tmp421_data *data = dev_get_drvdata(dev);
+ int ret;
+
+ switch (type) {
+ case hwmon_temp:
+ data->channel[channel].enabled = val;
+ ret = tmp421_enable_channels(data);
+ break;
+ default:
+ ret = -EOPNOTSUPP;
+ }
+
+ return ret;
+}
+
static umode_t tmp421_is_visible(const void *data, enum hwmon_sensor_types type,
u32 attr, int channel)
{
@@ -235,6 +258,8 @@ static umode_t tmp421_is_visible(const void *data, enum hwmon_sensor_types type,
return 0444;
case hwmon_temp_label:
return 0444;
+ case hwmon_temp_enable:
+ return 0644;
default:
return 0;
}
@@ -391,6 +416,7 @@ static const struct hwmon_ops tmp421_ops = {
.is_visible = tmp421_is_visible,
.read = tmp421_read,
.read_string = tmp421_read_string,
+ .write = tmp421_write,
};
static int tmp421_probe(struct i2c_client *client)
@@ -417,7 +443,7 @@ static int tmp421_probe(struct i2c_client *client)
return err;
for (i = 0; i < data->channels; i++) {
- data->temp_config[i] = HWMON_T_INPUT | HWMON_T_FAULT;
+ data->temp_config[i] = HWMON_T_INPUT | HWMON_T_FAULT | HWMON_T_ENABLE;
data->channel[i].enabled = true;
}
--
2.31.1
next prev parent reply other threads:[~2021-09-24 9:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 9:36 [PATCH v2 00/10] Add per channel properies support in tmp421 Krzysztof Adamski
2021-09-24 9:38 ` [PATCH v2 01/10] dt-bindings: hwmon: add missing tmp421 binding Krzysztof Adamski
2021-09-24 12:45 ` Rob Herring
2021-09-24 12:54 ` Krzysztof Adamski
2021-09-24 9:39 ` [PATCH v2 02/10] hwmon: (tmp421) introduce MAX_CHANNELS define Krzysztof Adamski
2021-09-24 12:05 ` Guenter Roeck
2021-09-24 9:39 ` [PATCH v2 03/10] hwmon: (tmp421) introduce a channel struct Krzysztof Adamski
2021-09-24 9:39 ` [PATCH v2 04/10] hwmon: (tmp421) add support for defining labels from DT Krzysztof Adamski
2021-09-24 12:17 ` Guenter Roeck
2021-09-24 12:27 ` Krzysztof Adamski
2021-09-24 9:40 ` [PATCH v2 05/10] hwmon: (tmp421) support disabling channels " Krzysztof Adamski
2021-09-24 9:40 ` [PATCH v2 06/10] hwmon: (tmp421) support specifying n-factor via DT Krzysztof Adamski
2021-09-24 9:42 ` [PATCH v2 07/10] hwmon: (tmp421) really disable channels Krzysztof Adamski
2021-09-24 12:12 ` Guenter Roeck
2021-09-24 9:43 ` Krzysztof Adamski [this message]
2021-09-24 9:44 ` [PATCH v2 09/10] hwmon: (tmp421) update documentation Krzysztof Adamski
2021-09-24 9:44 ` [PATCH v2 10/10] dt-bindings: hwmon: allow specifying channels for tmp421 Krzysztof Adamski
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=b92b0feafcdac34f606f052ced27f4c025c5ca45.1632473318.git.krzysztof.adamski@nokia.com \
--to=krzysztof.adamski@nokia.com \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=przemyslaw.cencner@nokia.com \
--cc=robh+dt@kernel.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).