* [PATCH v2 0/2] Extend the device-tree binding for lm90
@ 2022-06-07 6:35 Slawomir Stepien
2022-06-07 6:35 ` [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register Slawomir Stepien
2022-06-07 6:35 ` [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree Slawomir Stepien
0 siblings, 2 replies; 5+ messages in thread
From: Slawomir Stepien @ 2022-06-07 6:35 UTC (permalink / raw)
To: linux-hwmon
Cc: jdelvare, linux, przemyslaw.cencner, krzysztof.adamski,
alexander.sverdlin, sst, slawomir.stepien
From: Slawomir Stepien <slawomir.stepien@nokia.com>
This series extends the device-tree binding for lm90.
Support for channel's temperature offset has been added.
In lm90.c support for 2nd remote channel's temperature offset has been added (it is useful for
ADT7481 device) along side the needed changes for new bindings.
Note: this series has been rebased on hwmon/hwmon-next.
Version 2:
* Only patches that were not applied from v1 are here.
* PATCH 1/2 - updated, changelog in patch.
* PATCH 2/2 - updated, changelog in patch.
Slawomir Stepien (2):
hwmon: (lm90) Add support for 2nd remote channel's offset register
hwmon: (lm90) Read the channel's temperature offset from device-tree
drivers/hwmon/lm90.c | 74 ++++++++++++++++++++++++++++++++++++++++------
drivers/hwmon/occ/p9_sbe.c | 6 ++--
2 files changed, 67 insertions(+), 13 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register
2022-06-07 6:35 [PATCH v2 0/2] Extend the device-tree binding for lm90 Slawomir Stepien
@ 2022-06-07 6:35 ` Slawomir Stepien
2022-06-07 12:49 ` Guenter Roeck
2022-06-07 6:35 ` [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree Slawomir Stepien
1 sibling, 1 reply; 5+ messages in thread
From: Slawomir Stepien @ 2022-06-07 6:35 UTC (permalink / raw)
To: linux-hwmon
Cc: jdelvare, linux, przemyslaw.cencner, krzysztof.adamski,
alexander.sverdlin, sst, slawomir.stepien
From: Slawomir Stepien <slawomir.stepien@nokia.com>
The ADT7481 have LM90_HAVE_TEMP3 and LM90_HAVE_OFFSET flags, but the
support of second remote channel's offset is missing. Add that
implementation.
Signed-off-by: Slawomir Stepien <slawomir.stepien@nokia.com>
---
Changes since v1:
* New functions lm90_get_temp_offset and lm90_set_temp_offset.
* Use the same addresses to access remote channel 1 and 2 registers.
* Use new lm90_temp_offset_index translation table.
drivers/hwmon/lm90.c | 58 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 49 insertions(+), 9 deletions(-)
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index a18aed5f96d1..ec885cb3ab92 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -672,6 +672,7 @@ enum lm90_temp_reg_index {
REMOTE2_TEMP, /* max6695/96 only */
REMOTE2_LOW, /* max6695/96 only */
REMOTE2_HIGH, /* max6695/96 only */
+ REMOTE2_OFFSET,
TEMP_REG_NUM
};
@@ -1028,6 +1029,14 @@ static int lm90_update_limits(struct device *dev)
return val;
data->temp[REMOTE2_HIGH] = val << 8;
+ if (data->flags & LM90_HAVE_OFFSET) {
+ val = lm90_read16(client, LM90_REG_REMOTE_OFFSH,
+ LM90_REG_REMOTE_OFFSL, false);
+ if (val < 0)
+ return val;
+ data->temp[REMOTE2_OFFSET] = val;
+ }
+
lm90_select_remote_channel(data, false);
}
@@ -1298,6 +1307,7 @@ static int lm90_temp_get_resolution(struct lm90_data *data, int index)
return data->resolution;
return 8;
case REMOTE_OFFSET:
+ case REMOTE2_OFFSET:
case REMOTE2_TEMP:
return data->resolution;
case LOCAL_TEMP:
@@ -1428,6 +1438,36 @@ static int lm90_set_temphyst(struct lm90_data *data, long val)
return lm90_write_reg(data->client, LM90_REG_TCRIT_HYST, data->temp_hyst);
}
+static int lm90_get_temp_offset(struct lm90_data *data, int index)
+{
+ int res = lm90_temp_get_resolution(data, index);
+
+ return lm90_temp_from_reg(0, data->temp[index], res);
+}
+
+static int lm90_set_temp_offset(struct lm90_data *data, int index, int channel, long val)
+{
+ int err;
+
+ val = lm90_temp_to_reg(0, val, lm90_temp_get_resolution(data, index));
+
+ /* For ADT7481 we can use the same registers for remote channel 1 and 2 */
+ if (channel > 1)
+ lm90_select_remote_channel(data, true);
+
+ err = lm90_write16(data->client, LM90_REG_REMOTE_OFFSH, LM90_REG_REMOTE_OFFSL, val);
+
+ if (channel > 1)
+ lm90_select_remote_channel(data, false);
+
+ if (err)
+ return err;
+
+ data->temp[index] = val;
+
+ return 0;
+}
+
static const u8 lm90_temp_index[MAX_CHANNELS] = {
LOCAL_TEMP, REMOTE_TEMP, REMOTE2_TEMP
};
@@ -1448,6 +1488,10 @@ static const u8 lm90_temp_emerg_index[MAX_CHANNELS] = {
LOCAL_EMERG, REMOTE_EMERG, REMOTE2_EMERG
};
+static const s8 lm90_temp_offset_index[MAX_CHANNELS] = {
+ -1, REMOTE_OFFSET, REMOTE2_OFFSET
+};
+
static const u16 lm90_min_alarm_bits[MAX_CHANNELS] = { BIT(5), BIT(3), BIT(11) };
static const u16 lm90_max_alarm_bits[MAX_CHANNELS] = { BIT(6), BIT(4), BIT(12) };
static const u16 lm90_crit_alarm_bits[MAX_CHANNELS] = { BIT(0), BIT(1), BIT(9) };
@@ -1519,8 +1563,7 @@ static int lm90_temp_read(struct device *dev, u32 attr, int channel, long *val)
*val = lm90_get_temphyst(data, lm90_temp_emerg_index[channel], channel);
break;
case hwmon_temp_offset:
- *val = lm90_temp_from_reg(0, data->temp[REMOTE_OFFSET],
- lm90_temp_get_resolution(data, REMOTE_OFFSET));
+ *val = lm90_get_temp_offset(data, lm90_temp_offset_index[channel]);
break;
default:
return -EOPNOTSUPP;
@@ -1560,13 +1603,8 @@ static int lm90_temp_write(struct device *dev, u32 attr, int channel, long val)
channel, val);
break;
case hwmon_temp_offset:
- val = lm90_temp_to_reg(0, val,
- lm90_temp_get_resolution(data, REMOTE_OFFSET));
- err = lm90_write16(data->client, LM90_REG_REMOTE_OFFSH,
- LM90_REG_REMOTE_OFFSL, val);
- if (err)
- break;
- data->temp[REMOTE_OFFSET] = val;
+ err = lm90_set_temp_offset(data, lm90_temp_offset_index[channel],
+ channel, val);
break;
default:
err = -EOPNOTSUPP;
@@ -2803,6 +2841,8 @@ static int lm90_probe(struct i2c_client *client)
}
if (data->flags & LM90_HAVE_EMERGENCY_ALARM)
data->channel_config[2] |= HWMON_T_EMERGENCY_ALARM;
+ if (data->flags & LM90_HAVE_OFFSET)
+ data->channel_config[2] |= HWMON_T_OFFSET;
}
data->faultqueue_mask = lm90_params[data->kind].faultqueue_mask;
--
2.36.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree
2022-06-07 6:35 [PATCH v2 0/2] Extend the device-tree binding for lm90 Slawomir Stepien
2022-06-07 6:35 ` [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register Slawomir Stepien
@ 2022-06-07 6:35 ` Slawomir Stepien
2022-06-07 12:49 ` Guenter Roeck
1 sibling, 1 reply; 5+ messages in thread
From: Slawomir Stepien @ 2022-06-07 6:35 UTC (permalink / raw)
To: linux-hwmon
Cc: jdelvare, linux, przemyslaw.cencner, krzysztof.adamski,
alexander.sverdlin, sst, slawomir.stepien
From: Slawomir Stepien <slawomir.stepien@nokia.com>
Try to read the channel's temperature offset from device-tree. Having
offset in device-tree node is not mandatory. The offset can only be set
for remote channels.
Signed-off-by: Slawomir Stepien <slawomir.stepien@nokia.com>
---
Changes since v1:
* Use the new function lm90_set_temp_offset.
* Update the messages in dev_err() calls.
drivers/hwmon/lm90.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index ec885cb3ab92..9d878163a1f2 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -2666,6 +2666,7 @@ static int lm90_probe_channel_from_dt(struct i2c_client *client,
struct lm90_data *data)
{
u32 id;
+ s32 val;
int err;
struct device *dev = &client->dev;
@@ -2689,6 +2690,21 @@ static int lm90_probe_channel_from_dt(struct i2c_client *client,
if (data->channel_label[id])
data->channel_config[id] |= HWMON_T_LABEL;
+ err = of_property_read_s32(child, "temperature-offset-millicelsius", &val);
+ if (!err) {
+ if (id == 0) {
+ dev_err(dev, "temperature-offset-millicelsius can't be set for internal channel\n");
+ return -EINVAL;
+ }
+
+ err = lm90_set_temp_offset(data, lm90_temp_offset_index[id], id, val);
+ if (err) {
+ dev_err(dev, "can't set temperature offset %d for channel %d (%d)\n",
+ val, id, err);
+ return err;
+ }
+ }
+
return 0;
}
--
2.36.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register
2022-06-07 6:35 ` [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register Slawomir Stepien
@ 2022-06-07 12:49 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2022-06-07 12:49 UTC (permalink / raw)
To: Slawomir Stepien
Cc: linux-hwmon, jdelvare, przemyslaw.cencner, krzysztof.adamski,
alexander.sverdlin, slawomir.stepien
On Tue, Jun 07, 2022 at 08:35:03AM +0200, Slawomir Stepien wrote:
> From: Slawomir Stepien <slawomir.stepien@nokia.com>
>
> The ADT7481 have LM90_HAVE_TEMP3 and LM90_HAVE_OFFSET flags, but the
> support of second remote channel's offset is missing. Add that
> implementation.
>
> Signed-off-by: Slawomir Stepien <slawomir.stepien@nokia.com>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Changes since v1:
> * New functions lm90_get_temp_offset and lm90_set_temp_offset.
> * Use the same addresses to access remote channel 1 and 2 registers.
> * Use new lm90_temp_offset_index translation table.
>
> drivers/hwmon/lm90.c | 58 +++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 49 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
> index a18aed5f96d1..ec885cb3ab92 100644
> --- a/drivers/hwmon/lm90.c
> +++ b/drivers/hwmon/lm90.c
> @@ -672,6 +672,7 @@ enum lm90_temp_reg_index {
> REMOTE2_TEMP, /* max6695/96 only */
> REMOTE2_LOW, /* max6695/96 only */
> REMOTE2_HIGH, /* max6695/96 only */
> + REMOTE2_OFFSET,
>
> TEMP_REG_NUM
> };
> @@ -1028,6 +1029,14 @@ static int lm90_update_limits(struct device *dev)
> return val;
> data->temp[REMOTE2_HIGH] = val << 8;
>
> + if (data->flags & LM90_HAVE_OFFSET) {
> + val = lm90_read16(client, LM90_REG_REMOTE_OFFSH,
> + LM90_REG_REMOTE_OFFSL, false);
> + if (val < 0)
> + return val;
> + data->temp[REMOTE2_OFFSET] = val;
> + }
> +
> lm90_select_remote_channel(data, false);
> }
>
> @@ -1298,6 +1307,7 @@ static int lm90_temp_get_resolution(struct lm90_data *data, int index)
> return data->resolution;
> return 8;
> case REMOTE_OFFSET:
> + case REMOTE2_OFFSET:
> case REMOTE2_TEMP:
> return data->resolution;
> case LOCAL_TEMP:
> @@ -1428,6 +1438,36 @@ static int lm90_set_temphyst(struct lm90_data *data, long val)
> return lm90_write_reg(data->client, LM90_REG_TCRIT_HYST, data->temp_hyst);
> }
>
> +static int lm90_get_temp_offset(struct lm90_data *data, int index)
> +{
> + int res = lm90_temp_get_resolution(data, index);
> +
> + return lm90_temp_from_reg(0, data->temp[index], res);
> +}
> +
> +static int lm90_set_temp_offset(struct lm90_data *data, int index, int channel, long val)
> +{
> + int err;
> +
> + val = lm90_temp_to_reg(0, val, lm90_temp_get_resolution(data, index));
> +
> + /* For ADT7481 we can use the same registers for remote channel 1 and 2 */
> + if (channel > 1)
> + lm90_select_remote_channel(data, true);
> +
> + err = lm90_write16(data->client, LM90_REG_REMOTE_OFFSH, LM90_REG_REMOTE_OFFSL, val);
> +
> + if (channel > 1)
> + lm90_select_remote_channel(data, false);
> +
> + if (err)
> + return err;
> +
> + data->temp[index] = val;
> +
> + return 0;
> +}
> +
> static const u8 lm90_temp_index[MAX_CHANNELS] = {
> LOCAL_TEMP, REMOTE_TEMP, REMOTE2_TEMP
> };
> @@ -1448,6 +1488,10 @@ static const u8 lm90_temp_emerg_index[MAX_CHANNELS] = {
> LOCAL_EMERG, REMOTE_EMERG, REMOTE2_EMERG
> };
>
> +static const s8 lm90_temp_offset_index[MAX_CHANNELS] = {
> + -1, REMOTE_OFFSET, REMOTE2_OFFSET
> +};
> +
> static const u16 lm90_min_alarm_bits[MAX_CHANNELS] = { BIT(5), BIT(3), BIT(11) };
> static const u16 lm90_max_alarm_bits[MAX_CHANNELS] = { BIT(6), BIT(4), BIT(12) };
> static const u16 lm90_crit_alarm_bits[MAX_CHANNELS] = { BIT(0), BIT(1), BIT(9) };
> @@ -1519,8 +1563,7 @@ static int lm90_temp_read(struct device *dev, u32 attr, int channel, long *val)
> *val = lm90_get_temphyst(data, lm90_temp_emerg_index[channel], channel);
> break;
> case hwmon_temp_offset:
> - *val = lm90_temp_from_reg(0, data->temp[REMOTE_OFFSET],
> - lm90_temp_get_resolution(data, REMOTE_OFFSET));
> + *val = lm90_get_temp_offset(data, lm90_temp_offset_index[channel]);
> break;
> default:
> return -EOPNOTSUPP;
> @@ -1560,13 +1603,8 @@ static int lm90_temp_write(struct device *dev, u32 attr, int channel, long val)
> channel, val);
> break;
> case hwmon_temp_offset:
> - val = lm90_temp_to_reg(0, val,
> - lm90_temp_get_resolution(data, REMOTE_OFFSET));
> - err = lm90_write16(data->client, LM90_REG_REMOTE_OFFSH,
> - LM90_REG_REMOTE_OFFSL, val);
> - if (err)
> - break;
> - data->temp[REMOTE_OFFSET] = val;
> + err = lm90_set_temp_offset(data, lm90_temp_offset_index[channel],
> + channel, val);
> break;
> default:
> err = -EOPNOTSUPP;
> @@ -2803,6 +2841,8 @@ static int lm90_probe(struct i2c_client *client)
> }
> if (data->flags & LM90_HAVE_EMERGENCY_ALARM)
> data->channel_config[2] |= HWMON_T_EMERGENCY_ALARM;
> + if (data->flags & LM90_HAVE_OFFSET)
> + data->channel_config[2] |= HWMON_T_OFFSET;
> }
>
> data->faultqueue_mask = lm90_params[data->kind].faultqueue_mask;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree
2022-06-07 6:35 ` [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree Slawomir Stepien
@ 2022-06-07 12:49 ` Guenter Roeck
0 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2022-06-07 12:49 UTC (permalink / raw)
To: Slawomir Stepien
Cc: linux-hwmon, jdelvare, przemyslaw.cencner, krzysztof.adamski,
alexander.sverdlin, slawomir.stepien
On Tue, Jun 07, 2022 at 08:35:04AM +0200, Slawomir Stepien wrote:
> From: Slawomir Stepien <slawomir.stepien@nokia.com>
>
> Try to read the channel's temperature offset from device-tree. Having
> offset in device-tree node is not mandatory. The offset can only be set
> for remote channels.
>
> Signed-off-by: Slawomir Stepien <slawomir.stepien@nokia.com>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Changes since v1:
> * Use the new function lm90_set_temp_offset.
> * Update the messages in dev_err() calls.
>
> drivers/hwmon/lm90.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
> index ec885cb3ab92..9d878163a1f2 100644
> --- a/drivers/hwmon/lm90.c
> +++ b/drivers/hwmon/lm90.c
> @@ -2666,6 +2666,7 @@ static int lm90_probe_channel_from_dt(struct i2c_client *client,
> struct lm90_data *data)
> {
> u32 id;
> + s32 val;
> int err;
> struct device *dev = &client->dev;
>
> @@ -2689,6 +2690,21 @@ static int lm90_probe_channel_from_dt(struct i2c_client *client,
> if (data->channel_label[id])
> data->channel_config[id] |= HWMON_T_LABEL;
>
> + err = of_property_read_s32(child, "temperature-offset-millicelsius", &val);
> + if (!err) {
> + if (id == 0) {
> + dev_err(dev, "temperature-offset-millicelsius can't be set for internal channel\n");
> + return -EINVAL;
> + }
> +
> + err = lm90_set_temp_offset(data, lm90_temp_offset_index[id], id, val);
> + if (err) {
> + dev_err(dev, "can't set temperature offset %d for channel %d (%d)\n",
> + val, id, err);
> + return err;
> + }
> + }
> +
> return 0;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-07 12:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-07 6:35 [PATCH v2 0/2] Extend the device-tree binding for lm90 Slawomir Stepien
2022-06-07 6:35 ` [PATCH 1/2] hwmon: (lm90) Add support for 2nd remote channel's offset register Slawomir Stepien
2022-06-07 12:49 ` Guenter Roeck
2022-06-07 6:35 ` [PATCH 2/2] hwmon: (lm90) Read the channel's temperature offset from device-tree Slawomir Stepien
2022-06-07 12:49 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.