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 07/10] hwmon: (tmp421) really disable channels
Date: Fri, 24 Sep 2021 11:42:40 +0200 [thread overview]
Message-ID: <1553ef3db09cfa166b26b77c958f5c13576dfbaf.1632473318.git.krzysztof.adamski@nokia.com> (raw)
In-Reply-To: <cover.1632473318.git.krzysztof.adamski@nokia.com>
Recent patch added possibility to disable selected channels. That would
only make sure that the ENODATA is returned for those channels but would
not configure the actual hardware.
With this patch, the config register is written to make sure the
channels are disabled also at hardware level.
Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---
drivers/hwmon/tmp421.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 0fa4c02f5808..4934ce13afb4 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -33,6 +33,9 @@ enum chips { tmp421, tmp422, tmp423, tmp441, tmp442 };
/* The TMP421 registers */
#define TMP421_STATUS_REG 0x08
#define TMP421_CONFIG_REG_1 0x09
+#define TMP421_CONFIG_REG_2 0x0A
+#define TMP421_CONFIG_REG_REN(x) (BIT(3 + (x)))
+#define TMP421_CONFIG_REG_REN_MASK (BIT(3)|BIT(4)|BIT(5)|BIT(6))
#define TMP421_CONVERSION_RATE_REG 0x0B
#define TMP421_N_FACTOR_REG_1 0x21
#define TMP421_MANUFACTURER_ID_REG 0xFE
@@ -155,6 +158,33 @@ static struct tmp421_data *tmp421_update_device(struct device *dev)
return data;
}
+static int tmp421_enable_channels(struct tmp421_data *data)
+{
+ int err;
+ struct i2c_client *client = data->client;
+ struct device *dev = &client->dev;
+ int cfg = i2c_smbus_read_byte_data(client, TMP421_CONFIG_REG_2);
+ int i;
+
+ if (cfg < 0) {
+ dev_err(dev,
+ "error reading register, can't disable channels\n");
+ return err;
+ }
+
+ cfg &= ~TMP421_CONFIG_REG_REN_MASK;
+ for (i = 0; i < data->channels; i++)
+ if (data->channel[i].enabled)
+ cfg |= TMP421_CONFIG_REG_REN(i);
+
+ err = i2c_smbus_write_byte_data(client, TMP421_CONFIG_REG_2, cfg);
+ if (err < 0)
+ dev_err(dev,
+ "error writing register, can't disable channels\n");
+
+ return err;
+}
+
static int tmp421_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
@@ -395,6 +425,10 @@ static int tmp421_probe(struct i2c_client *client)
if (err)
return err;
+ err = tmp421_enable_channels(data);
+ if (err)
+ return err;
+
data->chip.ops = &tmp421_ops;
data->chip.info = data->info;
--
2.31.1
next prev parent reply other threads:[~2021-09-24 9:42 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 ` Krzysztof Adamski [this message]
2021-09-24 12:12 ` [PATCH v2 07/10] hwmon: (tmp421) really disable channels 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=1553ef3db09cfa166b26b77c958f5c13576dfbaf.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).