From: Guenter Roeck <linux@roeck-us.net>
To: linux-hwmon@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Lars Petter Mostad <lars.petter.mostad@appear.net>
Subject: [PATCH v2 2/3] hwmon: (emc1403) Support 11 bit accuracy
Date: Fri, 3 May 2024 08:43:23 -0700 [thread overview]
Message-ID: <20240503154324.517246-3-linux@roeck-us.net> (raw)
In-Reply-To: <20240503154324.517246-1-linux@roeck-us.net>
Various temperature and limit registers support 11 bit accuracy.
Add support for it.
Cc: Lars Petter Mostad <lars.petter.mostad@appear.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: Added patch
drivers/hwmon/emc1403.c | 55 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 52 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index e656f0432a57..e53bb4d8bc1b 100644
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -178,17 +178,52 @@ static u8 emc1403_temp_regs[][4] = {
},
};
+static s8 emc1403_temp_regs_low[][4] = {
+ [0] = {
+ [temp_min] = -1,
+ [temp_max] = -1,
+ [temp_crit] = -1,
+ [temp_input] = 0x29,
+ },
+ [1] = {
+ [temp_min] = 0x14,
+ [temp_max] = 0x13,
+ [temp_crit] = -1,
+ [temp_input] = 0x10,
+ },
+ [2] = {
+ [temp_min] = 0x18,
+ [temp_max] = 0x17,
+ [temp_crit] = -1,
+ [temp_input] = 0x24,
+ },
+ [3] = {
+ [temp_min] = 0x2f,
+ [temp_max] = 0x2e,
+ [temp_crit] = -1,
+ [temp_input] = 0x2b,
+ },
+};
+
static int __emc1403_get_temp(struct thermal_data *data, int channel,
enum emc1403_reg_map map, long *val)
{
unsigned int regval;
int ret;
+ s8 reg;
ret = regmap_read(data->regmap, emc1403_temp_regs[channel][map], ®val);
if (ret < 0)
return ret;
*val = regval * 1000;
+ reg = emc1403_temp_regs_low[channel][map];
+ if (reg >= 0) {
+ ret = regmap_read(data->regmap, reg, ®val);
+ if (ret < 0)
+ return ret;
+ *val += (regval >> 5) * 125;
+ }
return 0;
}
@@ -336,12 +371,26 @@ static int emc1403_set_temp(struct thermal_data *data, int channel,
{
unsigned int regval;
int ret;
+ u8 regh;
+ s8 regl;
- val = clamp_val(val, 0, 255000);
+ regh = emc1403_temp_regs[channel][map];
+ regl = emc1403_temp_regs_low[channel][map];
mutex_lock(&data->mutex);
- regval = DIV_ROUND_CLOSEST(val, 1000);
- ret = regmap_write(data->regmap, emc1403_temp_regs[channel][map], regval);
+ if (regl >= 0) {
+ val = clamp_val(val, 0, 255875);
+ regval = DIV_ROUND_CLOSEST(val, 125);
+ ret = regmap_write(data->regmap, regh, regval >> 3);
+ if (ret < 0)
+ goto unlock;
+ ret = regmap_write(data->regmap, regl, (regval & 0x07) << 5);
+ } else {
+ val = clamp_val(val, 0, 255000);
+ regval = DIV_ROUND_CLOSEST(val, 1000);
+ ret = regmap_write(data->regmap, regh, regval);
+ }
+unlock:
mutex_unlock(&data->mutex);
return ret;
}
--
2.39.2
next prev parent reply other threads:[~2024-05-03 15:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 15:43 [PATCH v2 0/3] hwmon: (emc1403) Various improvements Guenter Roeck
2024-05-03 15:43 ` [PATCH v2 1/3] hwmon: (emc1403) Convert to with_info API Guenter Roeck
2024-05-03 15:43 ` Guenter Roeck [this message]
2024-05-03 15:43 ` [PATCH v2 3/3] hwmon: (emc1403) Add support for conversion interval configuration Guenter Roeck
2024-05-06 14:44 ` [PATCH v2 0/3] hwmon: (emc1403) Various improvements Lars Petter Mostad
2024-05-06 23:17 ` Guenter Roeck
2024-05-07 11:27 ` Lars Petter Mostad
2024-05-07 13:29 ` 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=20240503154324.517246-3-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=lars.petter.mostad@appear.net \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.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
all inboxes | Powered by JetHome®