devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 04/10] hwmon: (tmp421) add support for defining labels from DT
Date: Fri, 24 Sep 2021 11:39:49 +0200	[thread overview]
Message-ID: <fab57edf8a0b8b2bcb2a7acefa1e1b65a9534f31.1632473318.git.krzysztof.adamski@nokia.com> (raw)
In-Reply-To: <cover.1632473318.git.krzysztof.adamski@nokia.com>

tmp42x is a multichannel temperature sensor with several external
channels. Since those channels can be used to connect diodes placed
anywhere in the system, their meaning will vary depending on the
project. For this case, the hwmon framework has an idea of labels which
allows us to assign the meaning to each channel.

The similar concept is already implemented in ina3221 - the label for
each channel can be defined via device tree. See commit a9e9dd9c6de5
("hwmon: (ina3221) Read channel input source info from DT")

This patch adds support for similar feature to tmp421.

Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---
 drivers/hwmon/tmp421.c | 61 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 1068fe59df0b..f9f910d60b12 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -88,6 +88,7 @@ static const struct of_device_id __maybe_unused tmp421_of_match[] = {
 MODULE_DEVICE_TABLE(of, tmp421_of_match);
 
 struct tmp421_channel {
+	const char *label;
 	s16 temp;
 };
 
@@ -177,6 +178,16 @@ static int tmp421_read(struct device *dev, enum hwmon_sensor_types type,
 
 }
 
+static int tmp421_read_string(struct device *dev, enum hwmon_sensor_types type,
+			     u32 attr, int channel, const char **str)
+{
+	struct tmp421_data *data = dev_get_drvdata(dev);
+
+	*str = data->channel[channel].label;
+
+	return 0;
+}
+
 static umode_t tmp421_is_visible(const void *data, enum hwmon_sensor_types type,
 				 u32 attr, int channel)
 {
@@ -187,6 +198,8 @@ static umode_t tmp421_is_visible(const void *data, enum hwmon_sensor_types type,
 		return 0444;
 	case hwmon_temp_input:
 		return 0444;
+	case hwmon_temp_label:
+		return 0444;
 	default:
 		return 0;
 	}
@@ -279,9 +292,53 @@ static int tmp421_detect(struct i2c_client *client,
 	return 0;
 }
 
+static int tmp421_probe_child_from_dt(struct i2c_client *client,
+				      struct device_node *child,
+				      struct tmp421_data *data)
+
+{
+	struct device *dev = &client->dev;
+	u32 i;
+	int err;
+
+	err = of_property_read_u32(child, "reg", &i);
+	if (err) {
+		dev_err(dev, "missing reg property of %pOFn\n", child);
+		return err;
+	}
+
+	if (i > MAX_CHANNELS) {
+		dev_err(dev, "invalid reg %d of %pOFn\n", i, child);
+		return -EINVAL;
+	}
+
+	of_property_read_string(child, "label", &data->channel[i].label);
+	if (data->channel[i].label)
+		data->temp_config[i] |= HWMON_T_LABEL;
+
+	return 0;
+}
+
+static int tmp421_probe_from_dt(struct i2c_client *client, struct tmp421_data *data)
+{
+	struct device *dev = &client->dev;
+	const struct device_node *np = dev->of_node;
+	struct device_node *child;
+	int err;
+
+	for_each_child_of_node(np, child) {
+		err = tmp421_probe_child_from_dt(client, child, data);
+		if (err)
+			return err;
+	}
+
+	return 0;
+}
+
 static const struct hwmon_ops tmp421_ops = {
 	.is_visible = tmp421_is_visible,
 	.read = tmp421_read,
+	.read_string = tmp421_read_string,
 };
 
 static int tmp421_probe(struct i2c_client *client)
@@ -310,6 +367,10 @@ static int tmp421_probe(struct i2c_client *client)
 	for (i = 0; i < data->channels; i++)
 		data->temp_config[i] = HWMON_T_INPUT | HWMON_T_FAULT;
 
+	err = tmp421_probe_from_dt(client, data);
+	if (err)
+		return err;
+
 	data->chip.ops = &tmp421_ops;
 	data->chip.info = data->info;
 
-- 
2.31.1


  parent reply	other threads:[~2021-09-24  9:39 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 ` Krzysztof Adamski [this message]
2021-09-24 12:17   ` [PATCH v2 04/10] hwmon: (tmp421) add support for defining labels from DT 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 ` [PATCH v2 08/10] hwmon: (tmp421) support HWMON_T_ENABLE Krzysztof Adamski
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=fab57edf8a0b8b2bcb2a7acefa1e1b65a9534f31.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).