From: Logan Shaw <logan.shaw@alliedtelesis.co.nz>
To: linux@roeck-us.net, jdelvare@suse.com, robh+dt@kernel.org
Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, Joshua.Scott@alliedtelesis.co.nz,
Chris.Packham@alliedtelesis.co.nz,
logan.shaw@alliedtelesis.co.nz
Subject: [PATCH v6 1/2] hwmon: (adt7475) Added attenuator bypass support
Date: Mon, 27 Jan 2020 11:10:13 +1300 [thread overview]
Message-ID: <20200126221014.2978-2-logan.shaw@alliedtelesis.co.nz> (raw)
In-Reply-To: <20200126221014.2978-1-logan.shaw@alliedtelesis.co.nz>
Added support for reading DTS properties to set attenuators on
device probe for the ADT7473, ADT7475, ADT7476, and ADT7490.
Signed-off-by: Logan Shaw <logan.shaw@alliedtelesis.co.nz>
---
---
drivers/hwmon/adt7475.c | 55 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c
index 6c64d50c9aae..3f4bdc1eaaec 100644
--- a/drivers/hwmon/adt7475.c
+++ b/drivers/hwmon/adt7475.c
@@ -19,6 +19,7 @@
#include <linux/hwmon-vid.h>
#include <linux/err.h>
#include <linux/jiffies.h>
+#include <linux/of.h>
#include <linux/util_macros.h>
/* Indexes for the sysfs hooks */
@@ -1457,6 +1458,57 @@ static int adt7475_update_limits(struct i2c_client *client)
return 0;
}
+static void modify_config(const struct i2c_client *client, char *property,
+ u8 *config, u8 bit_index)
+{
+ u32 prop_value = 0;
+ int ret = of_property_read_u32(client->dev.of_node, property,
+ &prop_value);
+
+ if (!ret) {
+ if (prop_value)
+ *config |= (1 << bit_index);
+ else
+ *config &= ~(1 << bit_index);
+ }
+}
+
+static int load_attenuators(const struct i2c_client *client, int chip,
+ u8 *config2, u8 *config4)
+{
+ u8 conf_copy;
+ int ret;
+
+ if (chip == adt7476 || chip == adt7490) {
+ conf_copy = *config4;
+
+ modify_config(client, "bypass-attenuator-in0", &conf_copy, 4);
+ modify_config(client, "bypass-attenuator-in1", &conf_copy, 5);
+ modify_config(client, "bypass-attenuator-in3", &conf_copy, 6);
+ modify_config(client, "bypass-attenuator-in4", &conf_copy, 7);
+
+ ret = i2c_smbus_write_byte_data(client, REG_CONFIG4,
+ conf_copy);
+ if (ret < 0)
+ return ret;
+
+ *config4 = conf_copy;
+ } else if (chip == adt7473 || chip == adt7475) {
+ conf_copy = *config2;
+
+ modify_config(client, "bypass-attenuator-in1", &conf_copy, 5);
+
+ ret = i2c_smbus_write_byte_data(client, REG_CONFIG2,
+ conf_copy);
+ if (ret < 0)
+ return ret;
+
+ *config2 = conf_copy;
+ }
+
+ return 0;
+}
+
static int adt7475_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -1546,6 +1598,9 @@ static int adt7475_probe(struct i2c_client *client,
/* Voltage attenuators can be bypassed, globally or individually */
config2 = adt7475_read(REG_CONFIG2);
+ if (load_attenuators(client, chip, &config2, &data->config4) < 0)
+ dev_warn(&client->dev, "Error setting bypass attenuators\n");
+
if (config2 & CONFIG2_ATTN) {
data->bypass_attn = (0x3 << 3) | 0x3;
} else {
--
2.25.0
next prev parent reply other threads:[~2020-01-26 22:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-26 22:10 [PATCH v6 0/2] hwmon: (adt7475) Added attenuator bypass support Logan Shaw
2020-01-26 22:10 ` Logan Shaw [this message]
2020-01-26 22:10 ` [PATCH v6 2/2] dt-bindings: hwmon: (adt7475) Added missing adt7475 documentation Logan Shaw
2020-01-27 15:48 ` Rob Herring
2020-01-29 4:30 ` Logan Shaw
2020-01-29 9:51 ` Guenter Roeck
2020-01-29 17:27 ` Rob Herring
2020-01-29 23:52 ` Logan Shaw
2020-01-30 3:07 ` Logan Shaw
2020-02-05 0:48 ` Logan Shaw
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=20200126221014.2978-2-logan.shaw@alliedtelesis.co.nz \
--to=logan.shaw@alliedtelesis.co.nz \
--cc=Chris.Packham@alliedtelesis.co.nz \
--cc=Joshua.Scott@alliedtelesis.co.nz \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--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).