Extend tps25990 existing driver to support tps1689 eFuse,
since they are sharing command interface and functionality
Update documentation for tps1689
Signed-off-by: Stoyan Bogdanov <sbogdanov@baylibre.com>
---
Documentation/hwmon/tps25990.rst | 15 ++++--
drivers/hwmon/pmbus/tps25990.c | 91 ++++++++++++++++++++++++++++----
2 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/Documentation/hwmon/tps25990.rst b/Documentation/hwmon/tps25990.rst
index 04faec780d26..e8bc9a550bda 100644
--- a/Documentation/hwmon/tps25990.rst
+++ b/Documentation/hwmon/tps25990.rst
@@ -9,26 +9,31 @@ Supported chips:
Prefix: 'tps25990'
- * Datasheet
+ Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
- Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
+ * TI TPS1689
+
+ Prefix: 'tps1689'
+
+ Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps1689
Author:
Jerome Brunet <jbrunet@baylibre.com>
+ Stoyan Bogdanov <sbogdanov@baylibre.com>
Description
-----------
-This driver implements support for TI TPS25990 eFuse.
+This driver implements support for TI TPS25990 and TI TPS1689 eFuse chips.
This is an integrated, high-current circuit protection and power
management device with PMBUS interface
-Device compliant with:
+Devices are compliant with:
- PMBus rev 1.3 interface.
-Device supports direct format for reading input voltages,
+Devices supports direct format for reading input voltages,
output voltage, input current, input power and temperature.
Due to the specificities of the chip, all history reset attributes
diff --git a/drivers/hwmon/pmbus/tps25990.c b/drivers/hwmon/pmbus/tps25990.c
index 33f6367f797c..f9ff4edadf53 100644
--- a/drivers/hwmon/pmbus/tps25990.c
+++ b/drivers/hwmon/pmbus/tps25990.c
@@ -58,34 +58,38 @@ struct tps25990_data {
struct local_direct_value *info_local;
};
-static int tps25990_raw_to_value(struct i2c_client *client, int param, int raw)
+static int tps25990_raw_to_value(struct i2c_client *client, int param, u32 raw)
{
struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
struct local_direct_value *info_local = data->info_local;
+ int val;
/* Formula : X = (Y / 10^R - b) / m */
if (info_local->R[param] >= 0)
- raw /= int_pow(10, info_local->R[param]);
+ val = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, info_local->R[param]));
else
- raw *= int_pow(10, -info_local->R[param]);
+ val = raw * int_pow(10, -info_local->R[param]);
- return DIV_ROUND_CLOSEST(raw - info_local->b[param], info_local->m[param]);
+ val = DIV_ROUND_CLOSEST(val - info_local->b[param], info_local->m[param]);
+
+ return val;
}
static unsigned int tps25990_value_to_raw(struct i2c_client *client, int param, int val)
{
struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
struct local_direct_value *info_local = data->info_local;
+ u32 raw; // return raw up to u16 -> u32
/* Formula : Y = ( m * X + b) * 10^R */
- val = (long)val * info_local->m[param] + info_local->b[param];
+ raw = ((long)val * info_local->m[param]) + info_local->b[param];
if (info_local->R[param] >= 0)
- val *= int_pow(10, info_local->R[param]);
+ raw *= int_pow(10, info_local->R[param]);
else
- val = DIV_ROUND_CLOSEST(val, int_pow(10, -info_local->R[param]));
+ raw = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, -info_local->R[param]));
- return val;
+ return raw;
}
/*
@@ -281,7 +285,6 @@ static int tps25990_write_word_data(struct i2c_client *client,
value = clamp_val(value, 0, 0xff);
ret = pmbus_write_word_data(client, page, reg, value);
break;
-
case PMBUS_VIN_OV_FAULT_LIMIT:
value = tps25990_value_to_raw(client, TPS25990_VIN_OVF, value);
value = clamp_val(value, 0, 0xf);
@@ -370,6 +373,15 @@ static const struct regulator_desc tps25990_reg_desc[] = {
};
#endif
+struct local_direct_value tps1689_local_info = {
+ .m[TPS25990_VIN_OVF] = 3984,
+ .b[TPS25990_VIN_OVF] = -63750,
+ .R[TPS25990_VIN_OVF] = -3,
+ .m[TPS25990_IIN_OCF] = 7111,
+ .b[TPS25990_IIN_OCF] = -2133,
+ .R[TPS25990_IIN_OCF] = -2,
+};
+
struct local_direct_value tps25590_local_info = {
.m[TPS25990_VIN_OVF] = 10163,
.b[TPS25990_VIN_OVF] = -30081,
@@ -379,6 +391,60 @@ struct local_direct_value tps25590_local_info = {
.R[TPS25990_IIN_OCF] = -6,
};
+static struct pmbus_driver_info tps1689_base_info = {
+ .pages = 1,
+ .format[PSC_VOLTAGE_IN] = direct,
+ .m[PSC_VOLTAGE_IN] = 1166,
+ .b[PSC_VOLTAGE_IN] = 0,
+ .R[PSC_VOLTAGE_IN] = -2,
+ .format[PSC_VOLTAGE_OUT] = direct,
+ .m[PSC_VOLTAGE_OUT] = 1166,
+ .b[PSC_VOLTAGE_OUT] = 0,
+ .R[PSC_VOLTAGE_OUT] = -2,
+ .format[PSC_TEMPERATURE] = direct,
+ .m[PSC_TEMPERATURE] = 140,
+ .b[PSC_TEMPERATURE] = 32103,
+ .R[PSC_TEMPERATURE] = -2,
+ /*
+ * Current and Power measurement depends on the ohm value
+ * of Rimon. m is multiplied by 1000 below to have an integer
+ * and -3 is added to R to compensate.
+ */
+ .format[PSC_CURRENT_IN] = direct,
+ .m[PSC_CURRENT_IN] = 9548,
+ .b[PSC_CURRENT_IN] = 0,
+ .R[PSC_CURRENT_IN] = -6,
+ .format[PSC_CURRENT_OUT] = direct,
+ .m[PSC_CURRENT_OUT] = 24347,
+ .b[PSC_CURRENT_OUT] = 0,
+ .R[PSC_CURRENT_OUT] = -3,
+ .format[PSC_POWER] = direct,
+ .m[PSC_POWER] = 2775,
+ .b[PSC_POWER] = 0,
+ .R[PSC_POWER] = -4,
+ .func[0] = (PMBUS_HAVE_VIN |
+ PMBUS_HAVE_VOUT |
+ PMBUS_HAVE_VMON |
+ PMBUS_HAVE_IIN |
+ PMBUS_HAVE_PIN |
+ PMBUS_HAVE_TEMP |
+ PMBUS_HAVE_STATUS_VOUT |
+ PMBUS_HAVE_STATUS_IOUT |
+ PMBUS_HAVE_STATUS_INPUT |
+ PMBUS_HAVE_STATUS_TEMP |
+ PMBUS_HAVE_SAMPLES),
+
+ .read_word_data = tps25990_read_word_data,
+ .write_word_data = tps25990_write_word_data,
+ .read_byte_data = tps25990_read_byte_data,
+ .write_byte_data = tps25990_write_byte_data,
+
+#if IS_ENABLED(CONFIG_SENSORS_TPS25990_REGULATOR)
+ .reg_desc = tps25990_reg_desc,
+ .num_regulators = ARRAY_SIZE(tps25990_reg_desc),
+#endif
+};
+
static struct pmbus_driver_info tps25990_base_info = {
.pages = 1,
.format[PSC_VOLTAGE_IN] = direct,
@@ -428,18 +494,25 @@ static struct pmbus_driver_info tps25990_base_info = {
#endif
};
+struct tps25990_data data_tps1689 = {
+ .info = &tps1689_base_info,
+ .info_local = &tps1689_local_info,
+};
+
struct tps25990_data data_tps25990 = {
.info = &tps25990_base_info,
.info_local = &tps25590_local_info,
};
static const struct i2c_device_id tps25990_i2c_id[] = {
+ { .name = "tps1689", .driver_data = (kernel_ulong_t)&data_tps1689 },
{ .name = "tps25990", .driver_data = (kernel_ulong_t)&data_tps25990 },
{}
};
MODULE_DEVICE_TABLE(i2c, tps25990_i2c_id);
static const struct of_device_id tps25990_of_match[] = {
+ { .compatible = "ti,tps1689", .data = &data_tps1689 },
{ .compatible = "ti,tps25990", .data = &data_tps25990 },
{}
};
--
2.34.1On Tue, Feb 17, 2026 at 10:12:03AM +0200, Stoyan Bogdanov wrote:
> Extend tps25990 existing driver to support tps1689 eFuse,
> since they are sharing command interface and functionality
> Update documentation for tps1689
>
> Signed-off-by: Stoyan Bogdanov <sbogdanov@baylibre.com>
> ---
> Documentation/hwmon/tps25990.rst | 15 ++++--
> drivers/hwmon/pmbus/tps25990.c | 91 ++++++++++++++++++++++++++++----
> 2 files changed, 92 insertions(+), 14 deletions(-)
>
> diff --git a/Documentation/hwmon/tps25990.rst b/Documentation/hwmon/tps25990.rst
> index 04faec780d26..e8bc9a550bda 100644
> --- a/Documentation/hwmon/tps25990.rst
> +++ b/Documentation/hwmon/tps25990.rst
> @@ -9,26 +9,31 @@ Supported chips:
>
> Prefix: 'tps25990'
>
> - * Datasheet
> + Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
>
> - Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
> + * TI TPS1689
> +
> + Prefix: 'tps1689'
> +
> + Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps1689
>
> Author:
>
> Jerome Brunet <jbrunet@baylibre.com>
> + Stoyan Bogdanov <sbogdanov@baylibre.com>
>
> Description
> -----------
>
> -This driver implements support for TI TPS25990 eFuse.
> +This driver implements support for TI TPS25990 and TI TPS1689 eFuse chips.
> This is an integrated, high-current circuit protection and power
> management device with PMBUS interface
>
> -Device compliant with:
> +Devices are compliant with:
>
> - PMBus rev 1.3 interface.
>
> -Device supports direct format for reading input voltages,
> +Devices supports direct format for reading input voltages,
> output voltage, input current, input power and temperature.
>
> Due to the specificities of the chip, all history reset attributes
> diff --git a/drivers/hwmon/pmbus/tps25990.c b/drivers/hwmon/pmbus/tps25990.c
> index 33f6367f797c..f9ff4edadf53 100644
> --- a/drivers/hwmon/pmbus/tps25990.c
> +++ b/drivers/hwmon/pmbus/tps25990.c
> @@ -58,34 +58,38 @@ struct tps25990_data {
> struct local_direct_value *info_local;
> };
>
> -static int tps25990_raw_to_value(struct i2c_client *client, int param, int raw)
> +static int tps25990_raw_to_value(struct i2c_client *client, int param, u32 raw)
> {
> struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
> struct local_direct_value *info_local = data->info_local;
> + int val;
>
> /* Formula : X = (Y / 10^R - b) / m */
> if (info_local->R[param] >= 0)
> - raw /= int_pow(10, info_local->R[param]);
> + val = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, info_local->R[param]));
> else
> - raw *= int_pow(10, -info_local->R[param]);
> + val = raw * int_pow(10, -info_local->R[param]);
Can the calculation in the 'else' branch overflow?
If info_local->R[param] is -6 (as it is for TPS25990_IIN_OCF), then
int_pow(10, 6) is 1,000,000. If raw is a 16-bit word like 65535, the product
is 65,535,000,000.
Since val is an int, it will overflow on 32-bit systems (and even on 64-bit
systems if int is 32-bit, which is the case in the kernel).
Should val be a 64-bit type for the intermediate calculation?
>
> - return DIV_ROUND_CLOSEST(raw - info_local->b[param], info_local->m[param]);
> + val = DIV_ROUND_CLOSEST(val - info_local->b[param], info_local->m[param]);
> +
> + return val;
> }
>
> static unsigned int tps25990_value_to_raw(struct i2c_client *client, int param, int val)
> {
> struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
> struct local_direct_value *info_local = data->info_local;
> + u32 raw; // return raw up to u16 -> u32
>
> /* Formula : Y = ( m * X + b) * 10^R */
> - val = (long)val * info_local->m[param] + info_local->b[param];
> + raw = ((long)val * info_local->m[param]) + info_local->b[param];
>
> if (info_local->R[param] >= 0)
> - val *= int_pow(10, info_local->R[param]);
> + raw *= int_pow(10, info_local->R[param]);
> else
> - val = DIV_ROUND_CLOSEST(val, int_pow(10, -info_local->R[param]));
> + raw = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, -info_local->R[param]));
>
> - return val;
> + return raw;
Does this change handle negative results correctly?
If (val * m + b) is negative, assigning it to the u32 raw variable will
result in a very large positive number due to underflow. Subsequent
scaling and clamping in the caller will then produce an incorrect result
(e.g., 0xf instead of 0).
The previous implementation used a signed type for the intermediate result.
Is there a reason to switch to u32 before the final result is determined?
> }
>
> /*
> @@ -281,7 +285,6 @@ static int tps25990_write_word_data(struct i2c_client *client,
> value = clamp_val(value, 0, 0xff);
> ret = pmbus_write_word_data(client, page, reg, value);
> break;
> -
> case PMBUS_VIN_OV_FAULT_LIMIT:
> value = tps25990_value_to_raw(client, TPS25990_VIN_OVF, value);
> value = clamp_val(value, 0, 0xf);
> @@ -370,6 +373,15 @@ static const struct regulator_desc tps25990_reg_desc[] = {
> };
> #endif
>
> +struct local_direct_value tps1689_local_info = {
> + .m[TPS25990_VIN_OVF] = 3984,
> + .b[TPS25990_VIN_OVF] = -63750,
> + .R[TPS25990_VIN_OVF] = -3,
> + .m[TPS25990_IIN_OCF] = 7111,
> + .b[TPS25990_IIN_OCF] = -2133,
> + .R[TPS25990_IIN_OCF] = -2,
> +};
> +
> struct local_direct_value tps25590_local_info = {
> .m[TPS25990_VIN_OVF] = 10163,
> .b[TPS25990_VIN_OVF] = -30081,
> @@ -379,6 +391,60 @@ struct local_direct_value tps25590_local_info = {
> .R[TPS25990_IIN_OCF] = -6,
> };
>
> +static struct pmbus_driver_info tps1689_base_info = {
> + .pages = 1,
> + .format[PSC_VOLTAGE_IN] = direct,
> + .m[PSC_VOLTAGE_IN] = 1166,
> + .b[PSC_VOLTAGE_IN] = 0,
> + .R[PSC_VOLTAGE_IN] = -2,
> + .format[PSC_VOLTAGE_OUT] = direct,
> + .m[PSC_VOLTAGE_OUT] = 1166,
> + .b[PSC_VOLTAGE_OUT] = 0,
> + .R[PSC_VOLTAGE_OUT] = -2,
> + .format[PSC_TEMPERATURE] = direct,
> + .m[PSC_TEMPERATURE] = 140,
> + .b[PSC_TEMPERATURE] = 32103,
> + .R[PSC_TEMPERATURE] = -2,
> + /*
> + * Current and Power measurement depends on the ohm value
> + * of Rimon. m is multiplied by 1000 below to have an integer
> + * and -3 is added to R to compensate.
> + */
> + .format[PSC_CURRENT_IN] = direct,
> + .m[PSC_CURRENT_IN] = 9548,
> + .b[PSC_CURRENT_IN] = 0,
> + .R[PSC_CURRENT_IN] = -6,
> + .format[PSC_CURRENT_OUT] = direct,
> + .m[PSC_CURRENT_OUT] = 24347,
> + .b[PSC_CURRENT_OUT] = 0,
> + .R[PSC_CURRENT_OUT] = -3,
> + .format[PSC_POWER] = direct,
> + .m[PSC_POWER] = 2775,
> + .b[PSC_POWER] = 0,
> + .R[PSC_POWER] = -4,
> + .func[0] = (PMBUS_HAVE_VIN |
> + PMBUS_HAVE_VOUT |
> + PMBUS_HAVE_VMON |
> + PMBUS_HAVE_IIN |
> + PMBUS_HAVE_PIN |
> + PMBUS_HAVE_TEMP |
> + PMBUS_HAVE_STATUS_VOUT |
> + PMBUS_HAVE_STATUS_IOUT |
> + PMBUS_HAVE_STATUS_INPUT |
> + PMBUS_HAVE_STATUS_TEMP |
> + PMBUS_HAVE_SAMPLES),
> +
> + .read_word_data = tps25990_read_word_data,
> + .write_word_data = tps25990_write_word_data,
> + .read_byte_data = tps25990_read_byte_data,
> + .write_byte_data = tps25990_write_byte_data,
> +
> +#if IS_ENABLED(CONFIG_SENSORS_TPS25990_REGULATOR)
> + .reg_desc = tps25990_reg_desc,
> + .num_regulators = ARRAY_SIZE(tps25990_reg_desc),
> +#endif
> +};
> +
> static struct pmbus_driver_info tps25990_base_info = {
> .pages = 1,
> .format[PSC_VOLTAGE_IN] = direct,
> @@ -428,18 +494,25 @@ static struct pmbus_driver_info tps25990_base_info = {
> #endif
> };
>
> +struct tps25990_data data_tps1689 = {
> + .info = &tps1689_base_info,
> + .info_local = &tps1689_local_info,
> +};
> +
> struct tps25990_data data_tps25990 = {
> .info = &tps25990_base_info,
> .info_local = &tps25590_local_info,
> };
>
> static const struct i2c_device_id tps25990_i2c_id[] = {
> + { .name = "tps1689", .driver_data = (kernel_ulong_t)&data_tps1689 },
> { .name = "tps25990", .driver_data = (kernel_ulong_t)&data_tps25990 },
> {}
> };
> MODULE_DEVICE_TABLE(i2c, tps25990_i2c_id);
>
> static const struct of_device_id tps25990_of_match[] = {
> + { .compatible = "ti,tps1689", .data = &data_tps1689 },
> { .compatible = "ti,tps25990", .data = &data_tps25990 },
> {}
> };
On Sun, Mar 8, 2026 at 7:34 PM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On Tue, Feb 17, 2026 at 10:12:03AM +0200, Stoyan Bogdanov wrote:
> > Extend tps25990 existing driver to support tps1689 eFuse,
> > since they are sharing command interface and functionality
> > Update documentation for tps1689
> >
> > Signed-off-by: Stoyan Bogdanov <sbogdanov@baylibre.com>
> > ---
> > Documentation/hwmon/tps25990.rst | 15 ++++--
> > drivers/hwmon/pmbus/tps25990.c | 91 ++++++++++++++++++++++++++++----
> > 2 files changed, 92 insertions(+), 14 deletions(-)
> >
> > diff --git a/Documentation/hwmon/tps25990.rst b/Documentation/hwmon/tps25990.rst
> > index 04faec780d26..e8bc9a550bda 100644
> > --- a/Documentation/hwmon/tps25990.rst
> > +++ b/Documentation/hwmon/tps25990.rst
> > @@ -9,26 +9,31 @@ Supported chips:
> >
> > Prefix: 'tps25990'
> >
> > - * Datasheet
> > + Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
> >
> > - Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps25990
> > + * TI TPS1689
> > +
> > + Prefix: 'tps1689'
> > +
> > + Datasheet: Publicly available at Texas Instruments website: https://www.ti.com/lit/gpn/tps1689
> >
> > Author:
> >
> > Jerome Brunet <jbrunet@baylibre.com>
> > + Stoyan Bogdanov <sbogdanov@baylibre.com>
> >
> > Description
> > -----------
> >
> > -This driver implements support for TI TPS25990 eFuse.
> > +This driver implements support for TI TPS25990 and TI TPS1689 eFuse chips.
> > This is an integrated, high-current circuit protection and power
> > management device with PMBUS interface
> >
> > -Device compliant with:
> > +Devices are compliant with:
> >
> > - PMBus rev 1.3 interface.
> >
> > -Device supports direct format for reading input voltages,
> > +Devices supports direct format for reading input voltages,
> > output voltage, input current, input power and temperature.
> >
> > Due to the specificities of the chip, all history reset attributes
> > diff --git a/drivers/hwmon/pmbus/tps25990.c b/drivers/hwmon/pmbus/tps25990.c
> > index 33f6367f797c..f9ff4edadf53 100644
> > --- a/drivers/hwmon/pmbus/tps25990.c
> > +++ b/drivers/hwmon/pmbus/tps25990.c
> > @@ -58,34 +58,38 @@ struct tps25990_data {
> > struct local_direct_value *info_local;
> > };
> >
> > -static int tps25990_raw_to_value(struct i2c_client *client, int param, int raw)
> > +static int tps25990_raw_to_value(struct i2c_client *client, int param, u32 raw)
> > {
> > struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
> > struct local_direct_value *info_local = data->info_local;
> > + int val;
> >
> > /* Formula : X = (Y / 10^R - b) / m */
> > if (info_local->R[param] >= 0)
> > - raw /= int_pow(10, info_local->R[param]);
> > + val = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, info_local->R[param]));
> > else
> > - raw *= int_pow(10, -info_local->R[param]);
> > + val = raw * int_pow(10, -info_local->R[param]);
>
> Can the calculation in the 'else' branch overflow?
>
> If info_local->R[param] is -6 (as it is for TPS25990_IIN_OCF), then
> int_pow(10, 6) is 1,000,000. If raw is a 16-bit word like 65535, the product
> is 65,535,000,000.
>
> Since val is an int, it will overflow on 32-bit systems (and even on 64-bit
> systems if int is 32-bit, which is the case in the kernel).
>
> Should val be a 64-bit type for the intermediate calculation?
>
> >
> > - return DIV_ROUND_CLOSEST(raw - info_local->b[param], info_local->m[param]);
> > + val = DIV_ROUND_CLOSEST(val - info_local->b[param], info_local->m[param]);
> > +
> > + return val;
> > }
> >
> > static unsigned int tps25990_value_to_raw(struct i2c_client *client, int param, int val)
> > {
> > struct tps25990_data *data = (struct tps25990_data *)of_device_get_match_data(&client->dev);
> > struct local_direct_value *info_local = data->info_local;
> > + u32 raw; // return raw up to u16 -> u32
> >
> > /* Formula : Y = ( m * X + b) * 10^R */
> > - val = (long)val * info_local->m[param] + info_local->b[param];
> > + raw = ((long)val * info_local->m[param]) + info_local->b[param];
> >
> > if (info_local->R[param] >= 0)
> > - val *= int_pow(10, info_local->R[param]);
> > + raw *= int_pow(10, info_local->R[param]);
> > else
> > - val = DIV_ROUND_CLOSEST(val, int_pow(10, -info_local->R[param]));
> > + raw = DIV_ROUND_CLOSEST_ULL(raw, int_pow(10, -info_local->R[param]));
> >
> > - return val;
> > + return raw;
>
> Does this change handle negative results correctly?
>
> If (val * m + b) is negative, assigning it to the u32 raw variable will
> result in a very large positive number due to underflow. Subsequent
> scaling and clamping in the caller will then produce an incorrect result
> (e.g., 0xf instead of 0).
>
> The previous implementation used a signed type for the intermediate result.
> Is there a reason to switch to u32 before the final result is determined?
This was supposed to be in to previous implementation because, CI
catch errors and this was theoretically the fix. This patch should
have only tps1689 related changes and those are not.
I will move them on next revision to if still needed after rework or
conversion functions to
hwmon: (pmbus/tps25990): Rework TPS25990 non standatd direct conversion
> > }
> >
> > /*
> > @@ -281,7 +285,6 @@ static int tps25990_write_word_data(struct i2c_client *client,
> > value = clamp_val(value, 0, 0xff);
> > ret = pmbus_write_word_data(client, page, reg, value);
> > break;
> > -
> > case PMBUS_VIN_OV_FAULT_LIMIT:
> > value = tps25990_value_to_raw(client, TPS25990_VIN_OVF, value);
> > value = clamp_val(value, 0, 0xf);
> > @@ -370,6 +373,15 @@ static const struct regulator_desc tps25990_reg_desc[] = {
> > };
> > #endif
> >
> > +struct local_direct_value tps1689_local_info = {
> > + .m[TPS25990_VIN_OVF] = 3984,
> > + .b[TPS25990_VIN_OVF] = -63750,
> > + .R[TPS25990_VIN_OVF] = -3,
> > + .m[TPS25990_IIN_OCF] = 7111,
> > + .b[TPS25990_IIN_OCF] = -2133,
> > + .R[TPS25990_IIN_OCF] = -2,
> > +};
> > +
> > struct local_direct_value tps25590_local_info = {
> > .m[TPS25990_VIN_OVF] = 10163,
> > .b[TPS25990_VIN_OVF] = -30081,
> > @@ -379,6 +391,60 @@ struct local_direct_value tps25590_local_info = {
> > .R[TPS25990_IIN_OCF] = -6,
> > };
> >
> > +static struct pmbus_driver_info tps1689_base_info = {
> > + .pages = 1,
> > + .format[PSC_VOLTAGE_IN] = direct,
> > + .m[PSC_VOLTAGE_IN] = 1166,
> > + .b[PSC_VOLTAGE_IN] = 0,
> > + .R[PSC_VOLTAGE_IN] = -2,
> > + .format[PSC_VOLTAGE_OUT] = direct,
> > + .m[PSC_VOLTAGE_OUT] = 1166,
> > + .b[PSC_VOLTAGE_OUT] = 0,
> > + .R[PSC_VOLTAGE_OUT] = -2,
> > + .format[PSC_TEMPERATURE] = direct,
> > + .m[PSC_TEMPERATURE] = 140,
> > + .b[PSC_TEMPERATURE] = 32103,
> > + .R[PSC_TEMPERATURE] = -2,
> > + /*
> > + * Current and Power measurement depends on the ohm value
> > + * of Rimon. m is multiplied by 1000 below to have an integer
> > + * and -3 is added to R to compensate.
> > + */
> > + .format[PSC_CURRENT_IN] = direct,
> > + .m[PSC_CURRENT_IN] = 9548,
> > + .b[PSC_CURRENT_IN] = 0,
> > + .R[PSC_CURRENT_IN] = -6,
> > + .format[PSC_CURRENT_OUT] = direct,
> > + .m[PSC_CURRENT_OUT] = 24347,
> > + .b[PSC_CURRENT_OUT] = 0,
> > + .R[PSC_CURRENT_OUT] = -3,
> > + .format[PSC_POWER] = direct,
> > + .m[PSC_POWER] = 2775,
> > + .b[PSC_POWER] = 0,
> > + .R[PSC_POWER] = -4,
> > + .func[0] = (PMBUS_HAVE_VIN |
> > + PMBUS_HAVE_VOUT |
> > + PMBUS_HAVE_VMON |
> > + PMBUS_HAVE_IIN |
> > + PMBUS_HAVE_PIN |
> > + PMBUS_HAVE_TEMP |
> > + PMBUS_HAVE_STATUS_VOUT |
> > + PMBUS_HAVE_STATUS_IOUT |
> > + PMBUS_HAVE_STATUS_INPUT |
> > + PMBUS_HAVE_STATUS_TEMP |
> > + PMBUS_HAVE_SAMPLES),
> > +
> > + .read_word_data = tps25990_read_word_data,
> > + .write_word_data = tps25990_write_word_data,
> > + .read_byte_data = tps25990_read_byte_data,
> > + .write_byte_data = tps25990_write_byte_data,
> > +
> > +#if IS_ENABLED(CONFIG_SENSORS_TPS25990_REGULATOR)
> > + .reg_desc = tps25990_reg_desc,
> > + .num_regulators = ARRAY_SIZE(tps25990_reg_desc),
> > +#endif
> > +};
> > +
> > static struct pmbus_driver_info tps25990_base_info = {
> > .pages = 1,
> > .format[PSC_VOLTAGE_IN] = direct,
> > @@ -428,18 +494,25 @@ static struct pmbus_driver_info tps25990_base_info = {
> > #endif
> > };
> >
> > +struct tps25990_data data_tps1689 = {
> > + .info = &tps1689_base_info,
> > + .info_local = &tps1689_local_info,
> > +};
> > +
> > struct tps25990_data data_tps25990 = {
> > .info = &tps25990_base_info,
> > .info_local = &tps25590_local_info,
> > };
> >
> > static const struct i2c_device_id tps25990_i2c_id[] = {
> > + { .name = "tps1689", .driver_data = (kernel_ulong_t)&data_tps1689 },
> > { .name = "tps25990", .driver_data = (kernel_ulong_t)&data_tps25990 },
> > {}
> > };
> > MODULE_DEVICE_TABLE(i2c, tps25990_i2c_id);
> >
> > static const struct of_device_id tps25990_of_match[] = {
> > + { .compatible = "ti,tps1689", .data = &data_tps1689 },
> > { .compatible = "ti,tps25990", .data = &data_tps25990 },
> > {}
> > };
© 2016 - 2026 Red Hat, Inc.