From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <linux-hwmon@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <robh+dt@kernel.org>, <linux@roeck-us.net>, <jdelvare@suse.com>,
<mark.thoren@analog.com>, <ardeleanalex@gmail.com>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH v3 1/4] hwmon: (ltc2945): wrap regmap into an ltc2945_state struct
Date: Thu, 7 Jan 2021 12:34:14 +0200 [thread overview]
Message-ID: <20210107103417.16010-2-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20210107103417.16010-1-alexandru.ardelean@analog.com>
The intent is to add pass the value of the sense resistor in the driver.
This change wraps a 'struct ltc2945_state', and moves the regmap reference
on that object.
Then we can add the value of the sense resistor, or other information that
would be useful for the driver.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/hwmon/ltc2945.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/drivers/hwmon/ltc2945.c b/drivers/hwmon/ltc2945.c
index ba9c868a8641..42a59170da78 100644
--- a/drivers/hwmon/ltc2945.c
+++ b/drivers/hwmon/ltc2945.c
@@ -58,6 +58,14 @@
#define CONTROL_MULT_SELECT (1 << 0)
#define CONTROL_TEST_MODE (1 << 4)
+/**
+ * struct ltc2945_state - driver instance specific data
+ * @regmap: regmap object to access device registers
+ */
+struct ltc2945_state {
+ struct regmap *regmap;
+};
+
static inline bool is_power_reg(u8 reg)
{
return reg < LTC2945_SENSE_H;
@@ -66,7 +74,8 @@ static inline bool is_power_reg(u8 reg)
/* Return the value from the given register in uW, mV, or mA */
static long long ltc2945_reg_to_val(struct device *dev, u8 reg)
{
- struct regmap *regmap = dev_get_drvdata(dev);
+ struct ltc2945_state *st = dev_get_drvdata(dev);
+ struct regmap *regmap = st->regmap;
unsigned int control;
u8 buf[3];
long long val;
@@ -148,7 +157,8 @@ static long long ltc2945_reg_to_val(struct device *dev, u8 reg)
static int ltc2945_val_to_reg(struct device *dev, u8 reg,
unsigned long val)
{
- struct regmap *regmap = dev_get_drvdata(dev);
+ struct ltc2945_state *st = dev_get_drvdata(dev);
+ struct regmap *regmap = st->regmap;
unsigned int control;
int ret;
@@ -234,7 +244,8 @@ static ssize_t ltc2945_value_store(struct device *dev,
const char *buf, size_t count)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
- struct regmap *regmap = dev_get_drvdata(dev);
+ struct ltc2945_state *st = dev_get_drvdata(dev);
+ struct regmap *regmap = st->regmap;
u8 reg = attr->index;
unsigned long val;
u8 regbuf[3];
@@ -269,7 +280,8 @@ static ssize_t ltc2945_history_store(struct device *dev,
const char *buf, size_t count)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
- struct regmap *regmap = dev_get_drvdata(dev);
+ struct ltc2945_state *st = dev_get_drvdata(dev);
+ struct regmap *regmap = st->regmap;
u8 reg = attr->index;
int num_regs = is_power_reg(reg) ? 3 : 2;
u8 buf_min[3] = { 0xff, 0xff, 0xff };
@@ -321,7 +333,8 @@ static ssize_t ltc2945_bool_show(struct device *dev,
struct device_attribute *da, char *buf)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
- struct regmap *regmap = dev_get_drvdata(dev);
+ struct ltc2945_state *st = dev_get_drvdata(dev);
+ struct regmap *regmap = st->regmap;
unsigned int fault;
int ret;
@@ -448,15 +461,22 @@ static const struct regmap_config ltc2945_regmap_config = {
static int ltc2945_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
+ struct ltc2945_state *st;
struct device *hwmon_dev;
struct regmap *regmap;
+ st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);
+ if (!st)
+ return -ENOMEM;
+
regmap = devm_regmap_init_i2c(client, <c2945_regmap_config);
if (IS_ERR(regmap)) {
dev_err(dev, "failed to allocate register map\n");
return PTR_ERR(regmap);
}
+ st->regmap = regmap;
+
/* Clear faults */
regmap_write(regmap, LTC2945_FAULT, 0x00);
--
2.17.1
next prev parent reply other threads:[~2021-01-07 10:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 10:34 [PATCH v3 0/4] hwmon: (ltc2945): add support for sense resistor Alexandru Ardelean
2021-01-07 10:34 ` Alexandru Ardelean [this message]
2021-01-07 10:34 ` [PATCH v3 2/4] hwmon: (ltc2945): clamp values before converting Alexandru Ardelean
2021-01-07 10:34 ` [PATCH v3 3/4] hwmon: (ltc2945): add support for sense resistor Alexandru Ardelean
2021-01-07 13:28 ` kernel test robot
2021-01-07 14:10 ` Alexandru Ardelean
2021-01-07 14:23 ` kernel test robot
2021-01-07 15:25 ` Guenter Roeck
2021-01-07 15:44 ` Alexandru Ardelean
2021-01-07 17:35 ` Guenter Roeck
2021-01-08 9:18 ` Alexandru Ardelean
2021-01-07 10:34 ` [PATCH v3 4/4] dt-bindings: hwmon: ltc2945: add device tree doc for ltc2945 Alexandru Ardelean
2021-01-07 15:28 ` [PATCH v3 0/4] hwmon: (ltc2945): add support for sense resistor Guenter Roeck
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=20210107103417.16010-2-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=ardeleanalex@gmail.com \
--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=mark.thoren@analog.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).