* [PATCH v6 1/8] dt-bindings: hwmon: ti,ina3221: Add SQ52210
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 2/8] hwmon: (ina3221) Add support for SQ52210 Wenliang Yan
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare, Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: Wenliang Yan, Jonathan Corbet, linux-hwmon, devicetree, linux-kernel
Add a compatible string for SQ52210, provide brief descriptions for
both INA3221 and SQ52210, and define the compatibility relationship
between SQ52210 and INA3221.
SQ52210 is backward compatible with INA3221.
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
.../devicetree/bindings/hwmon/ti,ina3221.yaml | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/hwmon/ti,ina3221.yaml b/Documentation/devicetree/bindings/hwmon/ti,ina3221.yaml
index 5f10f1207d69..2dd2fd148792 100644
--- a/Documentation/devicetree/bindings/hwmon/ti,ina3221.yaml
+++ b/Documentation/devicetree/bindings/hwmon/ti,ina3221.yaml
@@ -10,9 +10,22 @@ maintainers:
- Jean Delvare <jdelvare@suse.com>
- Guenter Roeck <linux@roeck-us.net>
+description: |
+ The INA3221 is a three-channel, high-side current and bus voltage monitor.
+
+ The Silergy SQ52210 is a power monitor that extends the functionality of
+ the INA3221 by adding additional current registers, power registers, and
+ alert registers. These features are configured internally by the driver
+ and require no board-level device tree configuration.
+
properties:
compatible:
- const: ti,ina3221
+ oneOf:
+ - items:
+ - const: silergy,sq52210
+ - const: ti,ina3221
+ - items:
+ - const: ti,ina3221
reg:
maxItems: 1
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 2/8] hwmon: (ina3221) Add support for SQ52210
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 1/8] dt-bindings: hwmon: ti,ina3221: Add SQ52210 Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 3/8] hwmon: (ina3221) Pre-calculate current and power LSB Wenliang Yan
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
Add Compatible for SQ52210.
Compared to the INA3221, the SQ52210 also has current registers,
power registers, and limit-related registers.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 5ecc68dcf169..47ef4fe694ea 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -34,6 +34,17 @@
#define INA3221_SHUNT_SUM 0x0d
#define INA3221_CRIT_SUM 0x0e
#define INA3221_MASK_ENABLE 0x0f
+#define SQ52210_ALERT_CONFIG 0x12
+#define SQ52210_CALIBRATION 0x14
+#define SQ52210_CURRENT1 0x15
+#define SQ52210_CURRENT2 0x16
+#define SQ52210_CURRENT3 0x17
+#define SQ52210_POWER1 0x18
+#define SQ52210_POWER2 0x19
+#define SQ52210_POWER3 0x1A
+#define SQ52210_ALERT_LIMIT1 0x1B
+#define SQ52210_ALERT_LIMIT2 0x1C
+#define SQ52210_ALERT_LIMIT3 0x1D
#define INA3221_CONFIG_MODE_MASK GENMASK(2, 0)
#define INA3221_CONFIG_MODE_POWERDOWN 0
@@ -108,8 +119,11 @@ struct ina3221_input {
bool summation_disable;
};
+enum ina3221_ids { ina3221, sq52210 };
+
/**
* struct ina3221_data - device specific information
+ * @chip: Chip type identifier
* @pm_dev: Device pointer for pm runtime
* @regmap: Register map of the device
* @fields: Register fields of the device
@@ -120,6 +134,8 @@ struct ina3221_input {
* @single_shot: running in single-shot operating mode
*/
struct ina3221_data {
+ enum ina3221_ids chip;
+
struct device *pm_dev;
struct regmap *regmap;
struct regmap_field *fields[F_MAX_FIELDS];
@@ -734,6 +750,7 @@ static const struct regmap_range ina3221_yes_ranges[] = {
regmap_reg_range(INA3221_CONFIG, INA3221_BUS3),
regmap_reg_range(INA3221_SHUNT_SUM, INA3221_SHUNT_SUM),
regmap_reg_range(INA3221_MASK_ENABLE, INA3221_MASK_ENABLE),
+ regmap_reg_range(SQ52210_ALERT_CONFIG, SQ52210_POWER3),
};
static const struct regmap_access_table ina3221_volatile_table = {
@@ -818,13 +835,18 @@ static int ina3221_probe(struct i2c_client *client)
struct device *dev = &client->dev;
struct ina3221_data *ina;
struct device *hwmon_dev;
+ enum ina3221_ids chip;
char name[32];
int i, ret;
+ chip = (uintptr_t)i2c_get_match_data(client);
+
ina = devm_kzalloc(dev, sizeof(*ina), GFP_KERNEL);
if (!ina)
return -ENOMEM;
+ ina->chip = chip;
+
ina->regmap = devm_regmap_init_i2c(client, &ina3221_regmap_config);
if (IS_ERR(ina->regmap)) {
dev_err(dev, "Unable to allocate register map\n");
@@ -996,13 +1018,21 @@ static DEFINE_RUNTIME_DEV_PM_OPS(ina3221_pm, ina3221_suspend, ina3221_resume,
NULL);
static const struct of_device_id ina3221_of_match_table[] = {
- { .compatible = "ti,ina3221", },
+ {
+ .compatible = "silergy,sq52210",
+ .data = (void *)sq52210
+ },
+ {
+ .compatible = "ti,ina3221",
+ .data = (void *)ina3221
+ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, ina3221_of_match_table);
static const struct i2c_device_id ina3221_ids[] = {
- { "ina3221" },
+ { "ina3221", ina3221 },
+ { "sq52210", sq52210 },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(i2c, ina3221_ids);
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 3/8] hwmon: (ina3221) Pre-calculate current and power LSB
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 1/8] dt-bindings: hwmon: ti,ina3221: Add SQ52210 Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 2/8] hwmon: (ina3221) Add support for SQ52210 Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 4/8] hwmon: (ina3221) Support alert configuration Wenliang Yan
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
The LSB for current and power can be pre-calculated for data read/write
operations. The current LSB is determined by the calibration value and
shunt resistor value, with the calibration value fixed within the driver.
The power LSB can be derived from the current LSB.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 85 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 47ef4fe694ea..e99ac5ef4d8a 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -67,6 +67,7 @@
#define INA3221_CONFIG_DEFAULT 0x7127
#define INA3221_RSHUNT_DEFAULT 10000
+#define SQ52210_SHUNT_LSB 40000000 /* pV/LSB */
enum ina3221_fields {
/* Configuration */
@@ -121,8 +122,16 @@ struct ina3221_input {
enum ina3221_ids { ina3221, sq52210 };
+struct ina3221_config {
+ bool has_current_reg; /* chip has internal current reg */
+ bool has_power_reg; /* chip has internal power reg */
+ int calibration_value; /* calculate current_lsb */
+ int power_lsb_factor;
+};
+
/**
* struct ina3221_data - device specific information
+ * @config: Used to store characteristics of different chips
* @chip: Chip type identifier
* @pm_dev: Device pointer for pm runtime
* @regmap: Register map of the device
@@ -131,9 +140,12 @@ enum ina3221_ids { ina3221, sq52210 };
* @reg_config: Register value of INA3221_CONFIG
* @summation_shunt_resistor: equivalent shunt resistor value for summation
* @summation_channel_control: Value written to SCC field in INA3221_MASK_ENABLE
+ * @current_lsb_uA: The value of one LSB corresponding to the current register
+ * @power_lsb_uW: The value of one LSB corresponding to the power register
* @single_shot: running in single-shot operating mode
*/
struct ina3221_data {
+ const struct ina3221_config *config;
enum ina3221_ids chip;
struct device *pm_dev;
@@ -143,10 +155,30 @@ struct ina3221_data {
u32 reg_config;
int summation_shunt_resistor;
u32 summation_channel_control;
+ long current_lsb_uA;
+ long power_lsb_uW;
bool single_shot;
};
+static const struct ina3221_config ina3221_config[] = {
+ [ina3221] = {
+ .has_current_reg = false,
+ .has_power_reg = false,
+ },
+ [sq52210] = {
+ .has_current_reg = true,
+ .has_power_reg = true,
+ /*
+ * With this default value configuration,
+ * the following formula can be obtained:
+ * Current_LSB = Shunt_LSB / Rshunt
+ */
+ .calibration_value = 256,
+ .power_lsb_factor = 20,
+ },
+};
+
static inline bool ina3221_is_enabled(struct ina3221_data *ina, int channel)
{
/* Summation channel checks shunt resistor values */
@@ -697,6 +729,25 @@ static const struct hwmon_chip_info ina3221_chip_info = {
};
/* Extra attribute groups */
+
+/*
+ * Calculate the value corresponding to one LSB of the current and
+ * power registers.
+ * formula : Current_LSB = Shunt_LSB / Rshunt
+ * Power_LSB = power_lsb_factor * Current_LSB
+ */
+static int ina3221_set_shunt(struct ina3221_data *ina, unsigned long val)
+{
+ if (!val || val > SQ52210_SHUNT_LSB)
+ return -EINVAL;
+
+ ina->current_lsb_uA = DIV_ROUND_CLOSEST(SQ52210_SHUNT_LSB, val);
+ ina->power_lsb_uW = ina->config->power_lsb_factor *
+ ina->current_lsb_uA;
+
+ return 0;
+}
+
static ssize_t ina3221_shunt_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -730,6 +781,17 @@ static ssize_t ina3221_shunt_store(struct device *dev,
/* Update summation_shunt_resistor for summation channel */
ina->summation_shunt_resistor = ina3221_summation_shunt_resistor(ina);
+ /*
+ * The current and power registers can only be used when
+ * all enabled channels have identical shunt resistors
+ */
+ if (ina->summation_shunt_resistor) {
+ if (ina->config->has_current_reg) {
+ ret = ina3221_set_shunt(ina, val);
+ if (ret < 0)
+ return ret;
+ }
+ }
return count;
}
@@ -846,6 +908,7 @@ static int ina3221_probe(struct i2c_client *client)
return -ENOMEM;
ina->chip = chip;
+ ina->config = &ina3221_config[chip];
ina->regmap = devm_regmap_init_i2c(client, &ina3221_regmap_config);
if (IS_ERR(ina->regmap)) {
@@ -892,6 +955,16 @@ static int ina3221_probe(struct i2c_client *client)
ina->summation_channel_control |= BIT(14 - i);
}
+ /*
+ * The current and power registers can only be used when
+ * all enabled channels have identical shunt resistors
+ */
+ if (ina->summation_shunt_resistor) {
+ ret = ina3221_set_shunt(ina, ina->summation_shunt_resistor);
+ if (ret < 0)
+ return ret;
+ }
+
ina->pm_dev = dev;
dev_set_drvdata(dev, ina);
@@ -1009,6 +1082,18 @@ static int ina3221_resume(struct device *dev)
dev_err(dev, "Unable to control summation channel\n");
return ret;
}
+ /*
+ * The calibration register can only be enabled when all
+ * shunt resistor values are identical.
+ */
+ if (ina->config->has_current_reg) {
+ ret = regmap_write(ina->regmap, SQ52210_CALIBRATION,
+ ina->config->calibration_value);
+ if (ret) {
+ dev_err(dev, "Unable to set calibration value\n");
+ return ret;
+ }
+ }
}
return 0;
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 4/8] hwmon: (ina3221) Support alert configuration
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
` (2 preceding siblings ...)
2026-02-25 9:03 ` [PATCH v6 3/8] hwmon: (ina3221) Pre-calculate current and power LSB Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 5/8] hwmon: (ina3221) Introduce power attribute and alert characteristics Wenliang Yan
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
Add alert configuration for initialization and resume.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index e99ac5ef4d8a..74dd937cc568 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -65,6 +65,8 @@
#define INA3221_MASK_ENABLE_SCC_MASK GENMASK(14, 12)
+#define SQ52210_ALERT_CONFIG_MASK GENMASK(15, 4)
+
#define INA3221_CONFIG_DEFAULT 0x7127
#define INA3221_RSHUNT_DEFAULT 10000
#define SQ52210_SHUNT_LSB 40000000 /* pV/LSB */
@@ -123,6 +125,7 @@ struct ina3221_input {
enum ina3221_ids { ina3221, sq52210 };
struct ina3221_config {
+ bool has_alerts_add; /* chip has addtional alert functions */
bool has_current_reg; /* chip has internal current reg */
bool has_power_reg; /* chip has internal power reg */
int calibration_value; /* calculate current_lsb */
@@ -140,6 +143,7 @@ struct ina3221_config {
* @reg_config: Register value of INA3221_CONFIG
* @summation_shunt_resistor: equivalent shunt resistor value for summation
* @summation_channel_control: Value written to SCC field in INA3221_MASK_ENABLE
+ * @alert_type_select: Used to store the alert trigger type
* @current_lsb_uA: The value of one LSB corresponding to the current register
* @power_lsb_uW: The value of one LSB corresponding to the power register
* @single_shot: running in single-shot operating mode
@@ -155,6 +159,7 @@ struct ina3221_data {
u32 reg_config;
int summation_shunt_resistor;
u32 summation_channel_control;
+ u32 alert_type_select;
long current_lsb_uA;
long power_lsb_uW;
@@ -163,10 +168,12 @@ struct ina3221_data {
static const struct ina3221_config ina3221_config[] = {
[ina3221] = {
+ .has_alerts_add = false,
.has_current_reg = false,
.has_power_reg = false,
},
[sq52210] = {
+ .has_alerts_add = true,
.has_current_reg = true,
.has_power_reg = true,
/*
@@ -948,6 +955,10 @@ static int ina3221_probe(struct i2c_client *client)
ina->reg_config &= ~INA3221_CONFIG_CHx_EN(i);
}
+ /* Initialize alert_type_select */
+ if (ina->config->has_alerts_add)
+ ina->alert_type_select = 0;
+
/* Initialize summation_shunt_resistor for summation channel control */
ina->summation_shunt_resistor = ina3221_summation_shunt_resistor(ina);
for (i = 0; i < INA3221_NUM_CHANNELS; i++) {
@@ -1096,6 +1107,17 @@ static int ina3221_resume(struct device *dev)
}
}
+ /* Restore alert config register value to hardware */
+ if (ina->config->has_alerts_add) {
+ ret = regmap_update_bits(ina->regmap, SQ52210_ALERT_CONFIG,
+ SQ52210_ALERT_CONFIG_MASK,
+ ina->alert_type_select & SQ52210_ALERT_CONFIG_MASK);
+ if (ret) {
+ dev_err(dev, "Unable to select alert type\n");
+ return ret;
+ }
+ }
+
return 0;
}
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 5/8] hwmon: (ina3221) Introduce power attribute and alert characteristics
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
` (3 preceding siblings ...)
2026-02-25 9:03 ` [PATCH v6 4/8] hwmon: (ina3221) Support alert configuration Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function Wenliang Yan
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, Shuah Khan, linux-hwmon, linux-kernel
SQ52210 has built-in current and power sensors as well as multiple
alert functions. Add power attributes and different critical
characteristics in hwmon to report the corresponding data.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
Documentation/hwmon/ina3221.rst | 24 ++++++++++++++
drivers/hwmon/ina3221.c | 57 ++++++++++++++++++++++++++++++---
2 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/Documentation/hwmon/ina3221.rst b/Documentation/hwmon/ina3221.rst
index 8c12c54d2c24..87637d7276ec 100644
--- a/Documentation/hwmon/ina3221.rst
+++ b/Documentation/hwmon/ina3221.rst
@@ -13,6 +13,13 @@ Supported chips:
https://www.ti.com/
+ * Silergy SQ52210
+
+ Prefix: 'SQ52210'
+
+ Addresses: I2C 0x40 - 0x43
+
+
Author: Andrew F. Davis <afd@ti.com>
Description
@@ -23,6 +30,9 @@ side of up to three D.C. power supplies. The INA3221 monitors both shunt drop
and supply voltage, with programmable conversion times and averaging, current
and power are calculated host-side from these.
+The SQ52210 is a mostly compatible chip from Silergy. It incorporates internal
+current and power registers, and provides an extra configurable alert function.
+
Sysfs entries
-------------
@@ -72,3 +82,17 @@ update_interval Data conversion time in millisecond, following:
Note that setting update_interval to 0ms sets both BC
and SC to 140 us (minimum conversion time).
======================= =======================================================
+
+Additional sysfs entries for sq52210
+-------------------------------------
+
+======================= =======================================================
+in[123]_crit Critical high bus voltage(mV)
+in[123]_crit_alarm Bus voltage critical high alarm
+in[123]_lcrit Critical low bus voltage(mV)
+in[123]_lcrit_alarm Bus voltage critical low alarm
+power[123]_input Power(uW) for channels 1, 2, and 3 respectively
+power[123]_crit Critical high power(uW)
+power[123]_crit_alarm Power critical high alarm
+curr[123]_lcrit Critical low current(mA)
+curr[123]_lcrit_alarm Current critical low alarm
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 74dd937cc568..a39f5f2c486b 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -645,6 +645,8 @@ static umode_t ina3221_is_visible(const void *drvdata,
{
const struct ina3221_data *ina = drvdata;
const struct ina3221_input *input = NULL;
+ bool has_alerts_add = ina->config->has_alerts_add;
+ bool has_power_reg = ina->config->has_power_reg;
switch (type) {
case hwmon_chip:
@@ -672,6 +674,16 @@ static umode_t ina3221_is_visible(const void *drvdata,
return 0444;
case hwmon_in_enable:
return 0644;
+ case hwmon_in_crit:
+ case hwmon_in_lcrit:
+ if (has_alerts_add)
+ return 0644;
+ return 0;
+ case hwmon_in_crit_alarm:
+ case hwmon_in_lcrit_alarm:
+ if (has_alerts_add)
+ return 0444;
+ return 0;
default:
return 0;
}
@@ -684,6 +696,31 @@ static umode_t ina3221_is_visible(const void *drvdata,
case hwmon_curr_crit:
case hwmon_curr_max:
return 0644;
+ case hwmon_curr_lcrit_alarm:
+ if (has_alerts_add)
+ return 0444;
+ return 0;
+ case hwmon_curr_lcrit:
+ if (has_alerts_add)
+ return 0644;
+ return 0;
+ default:
+ return 0;
+ }
+ case hwmon_power:
+ switch (attr) {
+ case hwmon_power_input:
+ if (has_power_reg)
+ return 0444;
+ return 0;
+ case hwmon_power_crit_alarm:
+ if (has_power_reg)
+ return 0444;
+ return 0;
+ case hwmon_power_crit:
+ if (has_power_reg)
+ return 0644;
+ return 0;
default:
return 0;
}
@@ -694,7 +731,14 @@ static umode_t ina3221_is_visible(const void *drvdata,
#define INA3221_HWMON_CURR_CONFIG (HWMON_C_INPUT | \
HWMON_C_CRIT | HWMON_C_CRIT_ALARM | \
- HWMON_C_MAX | HWMON_C_MAX_ALARM)
+ HWMON_C_MAX | HWMON_C_MAX_ALARM | \
+ HWMON_C_LCRIT | HWMON_C_LCRIT_ALARM)
+#define SQ52210_HWMON_POWER_CONFIG (HWMON_P_INPUT | \
+ HWMON_P_CRIT | HWMON_P_CRIT_ALARM)
+#define SQ52210_HWMON_BUS_CONFIG (HWMON_I_INPUT | \
+ HWMON_I_ENABLE | HWMON_I_LABEL | \
+ HWMON_I_LCRIT_ALARM | HWMON_I_LCRIT |\
+ HWMON_I_CRIT_ALARM | HWMON_I_CRIT)
static const struct hwmon_channel_info * const ina3221_info[] = {
HWMON_CHANNEL_INFO(chip,
@@ -704,9 +748,9 @@ static const struct hwmon_channel_info * const ina3221_info[] = {
/* 0: dummy, skipped in is_visible */
HWMON_I_INPUT,
/* 1-3: input voltage Channels */
- HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
- HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
- HWMON_I_INPUT | HWMON_I_ENABLE | HWMON_I_LABEL,
+ SQ52210_HWMON_BUS_CONFIG,
+ SQ52210_HWMON_BUS_CONFIG,
+ SQ52210_HWMON_BUS_CONFIG,
/* 4-6: shunt voltage Channels */
HWMON_I_INPUT,
HWMON_I_INPUT,
@@ -720,6 +764,11 @@ static const struct hwmon_channel_info * const ina3221_info[] = {
INA3221_HWMON_CURR_CONFIG,
/* 4: summation of current channels */
HWMON_C_INPUT | HWMON_C_CRIT | HWMON_C_CRIT_ALARM),
+ HWMON_CHANNEL_INFO(power,
+ /* 1-3: power channels*/
+ SQ52210_HWMON_POWER_CONFIG,
+ SQ52210_HWMON_POWER_CONFIG,
+ SQ52210_HWMON_POWER_CONFIG),
NULL
};
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
` (4 preceding siblings ...)
2026-02-25 9:03 ` [PATCH v6 5/8] hwmon: (ina3221) Introduce power attribute and alert characteristics Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 16:10 ` kernel test robot
2026-02-25 9:03 ` [PATCH v6 7/8] hwmon: (ina3221) Support alert_limit_write function and write/read functions for 'power' attribute Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 8/8] hwmon: (ina3221) Modify write/read functions for 'in' and 'curr' attribute Wenliang Yan
7 siblings, 1 reply; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
SQ52210 adds power, current, and limit registers. The ina3221_read_value
function has been refactored to adapt to the new register data reading
format.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 67 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 64 insertions(+), 3 deletions(-)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index a39f5f2c486b..77fc0dbef40d 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -66,6 +66,14 @@
#define INA3221_MASK_ENABLE_SCC_MASK GENMASK(14, 12)
#define SQ52210_ALERT_CONFIG_MASK GENMASK(15, 4)
+#define SQ52210_MASK_ALERT_CHANNEL1 (BIT(15) | BIT(12) | BIT(9) | BIT(6))
+#define SQ52210_MASK_ALERT_CHANNEL2 (BIT(14) | BIT(11) | BIT(8) | BIT(5))
+#define SQ52210_MASK_ALERT_CHANNEL3 (BIT(13) | BIT(10) | BIT(7) | BIT(4))
+
+#define SQ52210_ALERT_ALL_SUL_MASK (BIT(15) | BIT(14) | BIT(13))
+#define SQ52210_ALERT_ALL_BOL_MASK (BIT(12) | BIT(11) | BIT(10))
+#define SQ52210_ALERT_ALL_BUL_MASK (BIT(9) | BIT(8) | BIT(7))
+#define SQ52210_ALERT_ALL_POL_MASK (BIT(6) | BIT(5) | BIT(4))
#define INA3221_CONFIG_DEFAULT 0x7127
#define INA3221_RSHUNT_DEFAULT 10000
@@ -108,6 +116,13 @@ enum ina3221_channels {
INA3221_NUM_CHANNELS
};
+enum sq52210_alert_types {
+ SQ52210_ALERT_SUL,
+ SQ52210_ALERT_BOL,
+ SQ52210_ALERT_BUL,
+ SQ52210_ALERT_POL
+};
+
/**
* struct ina3221_input - channel input source specific information
* @label: label of channel input source
@@ -284,13 +299,59 @@ static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
/*
* Shunt Voltage Sum register has 14-bit value with 1-bit shift
+ * Current registers have 15-bit value
+ * Power registers have 16-bit value
+ * ALERT_LIMIT registers have 16-bit value with 3-bit shift
* Other Shunt Voltage registers have 12 bits with 3-bit shift
*/
- if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM)
+ switch (reg) {
+ case INA3221_SHUNT_SUM:
+ case INA3221_CRIT_SUM:
*val = sign_extend32(regval >> 1, 14);
- else
+ break;
+ case SQ52210_CURRENT1:
+ case SQ52210_CURRENT2:
+ case SQ52210_CURRENT3:
+ *val = sign_extend32(regval, 15);
+ break;
+ case SQ52210_POWER1:
+ case SQ52210_POWER2:
+ case SQ52210_POWER3:
+ *val = regval;
+ break;
+ case INA3221_BUS1:
+ case INA3221_BUS2:
+ case INA3221_BUS3:
+ case INA3221_SHUNT1:
+ case INA3221_SHUNT2:
+ case INA3221_SHUNT3:
+ case INA3221_WARN1:
+ case INA3221_WARN2:
+ case INA3221_WARN3:
+ case INA3221_CRIT1:
+ case INA3221_CRIT2:
+ case INA3221_CRIT3:
*val = sign_extend32(regval >> 3, 12);
-
+ break;
+ case SQ52210_ALERT_LIMIT1:
+ case SQ52210_ALERT_LIMIT2:
+ case SQ52210_ALERT_LIMIT3:
+ /*
+ * This register is a 16-bit register with the lower 3 bits fixed at 0.
+ * When used to store bus and shunt alert values, shifting is required.
+ * However, for POL (Power Over Limit), it functions as a 16-bit unsigned
+ * register where the lower 3 bits being fixed at 0 will result in some
+ * loss of precision.
+ */
+ if (ina->alert_type_select & SQ52210_ALERT_ALL_POL_MASK)
+ *val = regval;
+ else
+ *val = sign_extend32(regval >> 3, 12);
+ break;
+ default:
+ *val = 0;
+ return -EOPNOTSUPP;
+ };
return 0;
}
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function
2026-02-25 9:03 ` [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function Wenliang Yan
@ 2026-02-25 16:10 ` kernel test robot
0 siblings, 0 replies; 10+ messages in thread
From: kernel test robot @ 2026-02-25 16:10 UTC (permalink / raw)
To: Wenliang Yan, linux, Jean Delvare
Cc: oe-kbuild-all, Wenliang Yan, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Jonathan Corbet, linux-hwmon, linux-kernel
Hi Wenliang,
kernel test robot noticed the following build warnings:
[auto build test WARNING on groeck-staging/hwmon-next]
[also build test WARNING on robh/for-next linus/master v7.0-rc1 next-20260224]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Wenliang-Yan/dt-bindings-hwmon-ti-ina3221-Add-SQ52210/20260225-171447
base: https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next
patch link: https://lore.kernel.org/r/20260225090324.112145-7-wenliang202407%40163.com
patch subject: [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function
config: csky-randconfig-r051-20260225 (https://download.01.org/0day-ci/archive/20260226/202602260043.Og6ibhl8-lkp@intel.com/config)
compiler: csky-linux-gcc (GCC) 13.4.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202602260043.Og6ibhl8-lkp@intel.com/
cocci warnings: (new ones prefixed by >>)
>> drivers/hwmon/ina3221.c:354:2-3: Unneeded semicolon
vim +354 drivers/hwmon/ina3221.c
289
290 static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
291 int *val)
292 {
293 unsigned int regval;
294 int ret;
295
296 ret = regmap_read(ina->regmap, reg, ®val);
297 if (ret)
298 return ret;
299
300 /*
301 * Shunt Voltage Sum register has 14-bit value with 1-bit shift
302 * Current registers have 15-bit value
303 * Power registers have 16-bit value
304 * ALERT_LIMIT registers have 16-bit value with 3-bit shift
305 * Other Shunt Voltage registers have 12 bits with 3-bit shift
306 */
307 switch (reg) {
308 case INA3221_SHUNT_SUM:
309 case INA3221_CRIT_SUM:
310 *val = sign_extend32(regval >> 1, 14);
311 break;
312 case SQ52210_CURRENT1:
313 case SQ52210_CURRENT2:
314 case SQ52210_CURRENT3:
315 *val = sign_extend32(regval, 15);
316 break;
317 case SQ52210_POWER1:
318 case SQ52210_POWER2:
319 case SQ52210_POWER3:
320 *val = regval;
321 break;
322 case INA3221_BUS1:
323 case INA3221_BUS2:
324 case INA3221_BUS3:
325 case INA3221_SHUNT1:
326 case INA3221_SHUNT2:
327 case INA3221_SHUNT3:
328 case INA3221_WARN1:
329 case INA3221_WARN2:
330 case INA3221_WARN3:
331 case INA3221_CRIT1:
332 case INA3221_CRIT2:
333 case INA3221_CRIT3:
334 *val = sign_extend32(regval >> 3, 12);
335 break;
336 case SQ52210_ALERT_LIMIT1:
337 case SQ52210_ALERT_LIMIT2:
338 case SQ52210_ALERT_LIMIT3:
339 /*
340 * This register is a 16-bit register with the lower 3 bits fixed at 0.
341 * When used to store bus and shunt alert values, shifting is required.
342 * However, for POL (Power Over Limit), it functions as a 16-bit unsigned
343 * register where the lower 3 bits being fixed at 0 will result in some
344 * loss of precision.
345 */
346 if (ina->alert_type_select & SQ52210_ALERT_ALL_POL_MASK)
347 *val = regval;
348 else
349 *val = sign_extend32(regval >> 3, 12);
350 break;
351 default:
352 *val = 0;
353 return -EOPNOTSUPP;
> 354 };
355 return 0;
356 }
357
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v6 7/8] hwmon: (ina3221) Support alert_limit_write function and write/read functions for 'power' attribute
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
` (5 preceding siblings ...)
2026-02-25 9:03 ` [PATCH v6 6/8] hwmon: (ina3221) Modify the 'ina3221_read_value' function Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
2026-02-25 9:03 ` [PATCH v6 8/8] hwmon: (ina3221) Modify write/read functions for 'in' and 'curr' attribute Wenliang Yan
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
Each channel supports four new alert trigger modes, but only one trigger
mode can be active at any given time. Alert values are stored in the same
register. The sq52210_alert_limit_write function has been added to write
alert threshold values and configure alert source type.
SQ52210 adds power attributes to report power data and implements
corresponding read/write functions for this purpose. This includes
reading power values, reading alert thresholds, reading alert
trigger status, and writing alert thresholds.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 176 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 176 insertions(+)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index 77fc0dbef40d..f32f0f18e9b8 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -92,6 +92,9 @@ enum ina3221_fields {
/* Alert Flags: SF is the summation-alert flag */
F_SF, F_CF3, F_CF2, F_CF1,
+ /* Alert Flags: AFF is the alert function flag */
+ F_AFF3, F_AFF2, F_AFF1,
+
/* sentinel */
F_MAX_FIELDS
};
@@ -107,6 +110,10 @@ static const struct reg_field ina3221_reg_fields[] = {
[F_CF3] = REG_FIELD(INA3221_MASK_ENABLE, 7, 7),
[F_CF2] = REG_FIELD(INA3221_MASK_ENABLE, 8, 8),
[F_CF1] = REG_FIELD(INA3221_MASK_ENABLE, 9, 9),
+
+ [F_AFF3] = REG_FIELD(SQ52210_ALERT_CONFIG, 1, 1),
+ [F_AFF2] = REG_FIELD(SQ52210_ALERT_CONFIG, 2, 2),
+ [F_AFF1] = REG_FIELD(SQ52210_ALERT_CONFIG, 3, 3),
};
enum ina3221_channels {
@@ -123,6 +130,18 @@ enum sq52210_alert_types {
SQ52210_ALERT_POL
};
+static const u32 alert_groups[] = {
+ SQ52210_MASK_ALERT_CHANNEL1,
+ SQ52210_MASK_ALERT_CHANNEL2,
+ SQ52210_MASK_ALERT_CHANNEL3,
+};
+
+static const u8 limit_regs[] = {
+ SQ52210_ALERT_LIMIT1,
+ SQ52210_ALERT_LIMIT2,
+ SQ52210_ALERT_LIMIT3,
+};
+
/**
* struct ina3221_input - channel input source specific information
* @label: label of channel input source
@@ -504,6 +523,145 @@ static int ina3221_read_curr(struct device *dev, u32 attr,
}
}
+static const u8 ina3221_power_reg[][INA3221_NUM_CHANNELS] = {
+ [hwmon_power_input] = { SQ52210_POWER1, SQ52210_POWER2, SQ52210_POWER3 },
+ [hwmon_power_crit] = { SQ52210_ALERT_LIMIT1, SQ52210_ALERT_LIMIT2,
+ SQ52210_ALERT_LIMIT3 },
+ [hwmon_power_crit_alarm] = { F_AFF1, F_AFF2, F_AFF3 },
+};
+
+static int ina3221_read_power(struct device *dev, u32 attr, int channel, long *val)
+{
+ struct ina3221_data *ina = dev_get_drvdata(dev);
+ u8 reg = ina3221_power_reg[attr][channel];
+ int regval, ret;
+
+ switch (attr) {
+ case hwmon_power_input:
+ if (!ina3221_is_enabled(ina, channel))
+ return -ENODATA;
+
+ /* Write CONFIG register to trigger a single-shot measurement */
+ if (ina->single_shot) {
+ regmap_write(ina->regmap, INA3221_CONFIG,
+ ina->reg_config);
+
+ ret = ina3221_wait_for_data(ina);
+ if (ret)
+ return ret;
+ }
+
+ fallthrough;
+ case hwmon_power_crit:
+ ret = ina3221_read_value(ina, reg, ®val);
+ if (ret)
+ return ret;
+ /* Return power in uW */
+ *val = (u64)regval * (u64)ina->power_lsb_uW;
+ return 0;
+ case hwmon_power_crit_alarm:
+ /* No actual register read if channel is disabled */
+ if (!ina3221_is_enabled(ina, channel)) {
+ /* Return 0 for alert flags */
+ *val = 0;
+ return 0;
+ }
+
+ ret = regmap_field_read(ina->fields[reg], ®val);
+ if (ret)
+ return ret;
+ *val = regval;
+ return 0;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int sq52210_alert_limit_write(struct ina3221_data *ina,
+ enum sq52210_alert_types type, int channel, long val)
+{
+ struct regmap *regmap = ina->regmap;
+ int item = channel % INA3221_NUM_CHANNELS;
+ u8 limit_reg;
+ u32 alert_group, alert_mask = 0;
+ int regval = 0;
+ int ret;
+
+ if (item >= ARRAY_SIZE(alert_groups) || ((type == SQ52210_ALERT_POL) && val < 0))
+ return -EINVAL;
+
+ alert_group = alert_groups[item];
+ limit_reg = limit_regs[item];
+
+ /* Clear alerts for this channel group first */
+ ret = regmap_update_bits(regmap, SQ52210_ALERT_CONFIG, alert_group, 0);
+ if (ret)
+ return ret;
+
+ /* Determine alert type and calculate register value */
+ switch (type) {
+ /*
+ * The alert warning logic is implemented by comparing the limit register values
+ * with the corresponding alert source register values. The shunt voltage and bus
+ * voltage are 13-bit signed values, while power is a 16-bit unsigned value.
+ * However, the lower 3 bits of the limit register default to 0. Therefore, when
+ * setting warning values, the lower 3 bits will be forced to 0.
+ * The conversion formulas for the corresponding register values are:
+ * bus_voltage: (regval / 8mV) << 3 == (regval / 1mV)
+ * shunt_voltage: (regval / 40uV) << 3 == (regval / 5uV)
+ * current: (regval / current_lsb) & 0xfff8
+ * power: (regval / current_lsb) & 0xfff8
+ */
+ case SQ52210_ALERT_SUL:
+ /*
+ * For SUL configuration, directly convert it to current
+ * settings implemented in the ina3221_write_curr function.
+ */
+ return -EOPNOTSUPP;
+ case SQ52210_ALERT_BOL:
+ /* BOL: Bus Over Limit - BIT(12), BIT(11), BIT(10) */
+ alert_mask = BIT(12 - item);
+ /* Bus Register, signed register */
+ regval = val & 0xfff8;
+ regval = clamp_val(regval, -32760, 32760);
+ break;
+ case SQ52210_ALERT_BUL:
+ /* BUL: Bus Under Limit - BIT(9), BIT(8), BIT(7) */
+ alert_mask = BIT(9 - item);
+ /* Bus Register, signed register */
+ regval = val & 0xfff8;
+ regval = clamp_val(regval, -32760, 32760);
+ break;
+ case SQ52210_ALERT_POL:
+ /* POL: Power Over Limit - BIT(6), BIT(5), BIT(4) */
+ alert_mask = BIT(6 - item);
+ /* Power Register, unsigned register */
+ regval = (u32)DIV_U64_ROUND_CLOSEST((u64)val, ina->power_lsb_uW);
+ regval = clamp_val(regval, 0, 65528) & 0xfff8;
+ break;
+ default:
+ /* For unsupported attributes, just clear the configuration */
+ ina->alert_type_select &= ~alert_group;
+ return -EOPNOTSUPP;
+ }
+
+ /* Write limit register value */
+ ret = regmap_write(regmap, limit_reg, regval);
+ if (ret)
+ return ret;
+
+ /* Update alert configuration if limit value is non-zero */
+ if (regval) {
+ ina->alert_type_select = (ina->alert_type_select & ~alert_group) | alert_mask;
+ ret = regmap_update_bits(regmap, SQ52210_ALERT_CONFIG,
+ alert_group, alert_mask);
+ } else {
+ ina->alert_type_select &= ~alert_group;
+ }
+
+ return ret;
+}
+
static int ina3221_write_chip(struct device *dev, u32 attr, long val)
{
struct ina3221_data *ina = dev_get_drvdata(dev);
@@ -640,6 +798,18 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)
return ret;
}
+static int ina3221_write_power(struct device *dev, u32 attr, int channel, long val)
+{
+ struct ina3221_data *ina = dev_get_drvdata(dev);
+
+ switch (attr) {
+ case hwmon_power_crit:
+ return sq52210_alert_limit_write(ina, SQ52210_ALERT_POL, channel, val);
+ default:
+ return 0;
+ }
+}
+
static int ina3221_read(struct device *dev, enum hwmon_sensor_types type,
u32 attr, int channel, long *val)
{
@@ -656,6 +826,9 @@ static int ina3221_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_curr:
ret = ina3221_read_curr(dev, attr, channel, val);
break;
+ case hwmon_power:
+ ret = ina3221_read_power(dev, attr, channel, val);
+ break;
default:
ret = -EOPNOTSUPP;
break;
@@ -679,6 +852,9 @@ static int ina3221_write(struct device *dev, enum hwmon_sensor_types type,
case hwmon_curr:
ret = ina3221_write_curr(dev, attr, channel, val);
break;
+ case hwmon_power:
+ ret = ina3221_write_power(dev, attr, channel, val);
+ break;
default:
ret = -EOPNOTSUPP;
break;
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v6 8/8] hwmon: (ina3221) Modify write/read functions for 'in' and 'curr' attribute
2026-02-25 9:03 [PATCH v6 0/8] hwmon: (ina3221) Various improvement and add support for SQ52210 Wenliang Yan
` (6 preceding siblings ...)
2026-02-25 9:03 ` [PATCH v6 7/8] hwmon: (ina3221) Support alert_limit_write function and write/read functions for 'power' attribute Wenliang Yan
@ 2026-02-25 9:03 ` Wenliang Yan
7 siblings, 0 replies; 10+ messages in thread
From: Wenliang Yan @ 2026-02-25 9:03 UTC (permalink / raw)
To: linux, Jean Delvare
Cc: Wenliang Yan, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Jonathan Corbet, linux-hwmon, linux-kernel
Modified the relevant read/write functions for 'in' and 'curr' attributes,
adding support for crit, lcrit, crit_alarm, and lcrit_alarm features.
Signed-off-by: Wenliang Yan <wenliang202407@163.com>
---
drivers/hwmon/ina3221.c | 109 +++++++++++++++++++++++++++++++++++++---
1 file changed, 102 insertions(+), 7 deletions(-)
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c
index f32f0f18e9b8..bb01a698ebe6 100644
--- a/drivers/hwmon/ina3221.c
+++ b/drivers/hwmon/ina3221.c
@@ -142,6 +142,12 @@ static const u8 limit_regs[] = {
SQ52210_ALERT_LIMIT3,
};
+static const u8 alert_flag[] = {
+ F_AFF1,
+ F_AFF2,
+ F_AFF3,
+};
+
/**
* struct ina3221_input - channel input source specific information
* @label: label of channel input source
@@ -446,6 +452,42 @@ static int ina3221_read_in(struct device *dev, u32 attr, int channel, long *val)
case hwmon_in_enable:
*val = ina3221_is_enabled(ina, channel);
return 0;
+ case hwmon_in_crit:
+ case hwmon_in_lcrit:
+ /* Only for Bus Voltage */
+ if (channel >= INA3221_NUM_CHANNELS)
+ return -EOPNOTSUPP;
+
+ if (!ina3221_is_enabled(ina, channel))
+ return -ENODATA;
+
+ reg = limit_regs[channel];
+ ret = ina3221_read_value(ina, reg, ®val);
+ if (ret)
+ return ret;
+ /*
+ * Scale of bus voltage (mV): LSB is 8mV
+ */
+ *val = regval * 8;
+ return 0;
+ case hwmon_in_crit_alarm:
+ case hwmon_in_lcrit_alarm:
+ /* Only for Bus Voltage */
+ if (channel >= INA3221_NUM_CHANNELS)
+ return -EOPNOTSUPP;
+ /* No actual register read if channel is disabled */
+ if (!ina3221_is_enabled(ina, channel)) {
+ /* Return 0 for alert flags */
+ *val = 0;
+ return 0;
+ }
+
+ reg = alert_flag[channel];
+ ret = regmap_field_read(ina->fields[reg], ®val);
+ if (ret)
+ return ret;
+ *val = regval;
+ return 0;
default:
return -EOPNOTSUPP;
}
@@ -457,8 +499,16 @@ static const u8 ina3221_curr_reg[][INA3221_NUM_CHANNELS + 1] = {
[hwmon_curr_max] = { INA3221_WARN1, INA3221_WARN2, INA3221_WARN3, 0 },
[hwmon_curr_crit] = { INA3221_CRIT1, INA3221_CRIT2,
INA3221_CRIT3, INA3221_CRIT_SUM },
+ [hwmon_curr_lcrit] = { SQ52210_ALERT_LIMIT1, SQ52210_ALERT_LIMIT2,
+ SQ52210_ALERT_LIMIT3, 0 },
[hwmon_curr_max_alarm] = { F_WF1, F_WF2, F_WF3, 0 },
[hwmon_curr_crit_alarm] = { F_CF1, F_CF2, F_CF3, F_SF },
+ [hwmon_curr_lcrit_alarm] = { F_AFF1, F_AFF2, F_AFF3, 0 },
+};
+static const u8 sq52210_curr_reg[INA3221_NUM_CHANNELS] = {
+ SQ52210_CURRENT1,
+ SQ52210_CURRENT2,
+ SQ52210_CURRENT3
};
static int ina3221_read_curr(struct device *dev, u32 attr,
@@ -467,6 +517,7 @@ static int ina3221_read_curr(struct device *dev, u32 attr,
struct ina3221_data *ina = dev_get_drvdata(dev);
struct ina3221_input *input = ina->inputs;
u8 reg = ina3221_curr_reg[attr][channel];
+ bool has_current_reg = ina->config->has_current_reg;
int resistance_uo, voltage_nv;
int regval, ret;
@@ -489,10 +540,20 @@ static int ina3221_read_curr(struct device *dev, u32 attr,
if (ret)
return ret;
}
+ if (has_current_reg == true) {
+ reg = sq52210_curr_reg[channel];
+ ret = ina3221_read_value(ina, reg, ®val);
+ if (ret)
+ return ret;
+ /* Return current in mA */
+ *val = DIV_U64_ROUND_CLOSEST((u64)regval * (u64)ina->current_lsb_uA, 1000);
+ return 0;
+ }
fallthrough;
case hwmon_curr_crit:
case hwmon_curr_max:
+ case hwmon_curr_lcrit:
if (!resistance_uo)
return -ENODATA;
@@ -507,6 +568,7 @@ static int ina3221_read_curr(struct device *dev, u32 attr,
return 0;
case hwmon_curr_crit_alarm:
case hwmon_curr_max_alarm:
+ case hwmon_curr_lcrit_alarm:
/* No actual register read if channel is disabled */
if (!ina3221_is_enabled(ina, channel)) {
/* Return 0 for alert flags */
@@ -617,7 +679,9 @@ static int sq52210_alert_limit_write(struct ina3221_data *ina,
* For SUL configuration, directly convert it to current
* settings implemented in the ina3221_write_curr function.
*/
- return -EOPNOTSUPP;
+ alert_mask = BIT(15 - channel);
+ regval = val;
+ break;
case SQ52210_ALERT_BOL:
/* BOL: Bus Over Limit - BIT(12), BIT(11), BIT(10) */
alert_mask = BIT(12 - item);
@@ -711,12 +775,18 @@ static int ina3221_write_curr(struct device *dev, u32 attr,
struct ina3221_input *input = ina->inputs;
u8 reg = ina3221_curr_reg[attr][channel];
int resistance_uo, current_ma, voltage_uv;
- int regval;
+ int regval, ret;
- if (channel > INA3221_CHANNEL3)
- resistance_uo = ina->summation_shunt_resistor;
- else
+ if (attr == hwmon_curr_lcrit) {
+ if (channel > INA3221_CHANNEL3)
+ return -EOPNOTSUPP;
resistance_uo = input[channel].shunt_resistor;
+ } else {
+ if (channel > INA3221_CHANNEL3)
+ resistance_uo = ina->summation_shunt_resistor;
+ else
+ resistance_uo = input[channel].shunt_resistor;
+ }
if (!resistance_uo)
return -EOPNOTSUPP;
@@ -747,7 +817,12 @@ static int ina3221_write_curr(struct device *dev, u32 attr,
else
regval = DIV_ROUND_CLOSEST(voltage_uv, 5) & 0xfff8;
- return regmap_write(ina->regmap, reg, regval);
+ if (attr == hwmon_curr_lcrit)
+ ret = sq52210_alert_limit_write(ina, SQ52210_ALERT_SUL, channel, regval);
+ else
+ ret = regmap_write(ina->regmap, reg, regval);
+
+ return ret;
}
static int ina3221_write_enable(struct device *dev, int channel, bool enable)
@@ -798,6 +873,26 @@ static int ina3221_write_enable(struct device *dev, int channel, bool enable)
return ret;
}
+static int ina3221_write_in(struct device *dev, u32 attr, int channel, long val)
+{
+ struct ina3221_data *ina = dev_get_drvdata(dev);
+
+ if (attr == hwmon_in_lcrit || attr == hwmon_in_crit)
+ if (channel >= INA3221_NUM_CHANNELS)
+ return -EOPNOTSUPP;
+
+ switch (attr) {
+ case hwmon_in_lcrit:
+ return sq52210_alert_limit_write(ina, SQ52210_ALERT_BUL, channel, val);
+ case hwmon_in_crit:
+ return sq52210_alert_limit_write(ina, SQ52210_ALERT_BOL, channel, val);
+ case hwmon_in_enable:
+ return ina3221_write_enable(dev, channel, val);
+ default:
+ return 0;
+ }
+}
+
static int ina3221_write_power(struct device *dev, u32 attr, int channel, long val)
{
struct ina3221_data *ina = dev_get_drvdata(dev);
@@ -847,7 +942,7 @@ static int ina3221_write(struct device *dev, enum hwmon_sensor_types type,
break;
case hwmon_in:
/* 0-align channel ID */
- ret = ina3221_write_enable(dev, channel - 1, val);
+ ret = ina3221_write_in(dev, attr, channel - 1, val);
break;
case hwmon_curr:
ret = ina3221_write_curr(dev, attr, channel, val);
--
2.17.1
^ permalink raw reply [flat|nested] 10+ messages in thread