From nobody Wed Dec 17 09:21:21 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E7F60215766; Thu, 27 Mar 2025 13:20:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743081635; cv=none; b=gP9X6/pARxUNvkl2SdtZpNW3cAezsTumGdoEJEDkpJQMH5OFscPy9mf2jQAJvAkjWoXwnHQgWZhcQjfWSiftgwt7I+/XEtEPqp00AQEcfwIE8y9ATQKYAec1qPH6b3ZNYpv/L6Fo0kzvQC3sg1PDoZ9wuUcv3gZ11fyrukUJrTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743081635; c=relaxed/simple; bh=9FfsYTvMfnGAW1DRmPFAo5D567d0/GOoXHmOHVHXb4A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=LOF/uptd3KzwlfdWh0DL/cVaLhq99022my7RWvZVBVE3zrE6SjW/3Hu/TvzuH7vDrEu6lc7cbC0u3Fjuvp8sIFikGMHuW/ntwKEO61TbP8w0rv8OPV2eOew7lSLkif26zsziN9fnBVueREedYGiS69VmUIy31ARs6zKkORv7hQM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=GI+eFnpt; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="GI+eFnpt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ccjpdSp2xrPRUXYSwj HWTIDWiwufqUnvm1RB7AloXe0=; b=GI+eFnptuJIzNHFd8F4MCmA/NVm1haKX0T 7Gq+J0WkCWSWslboAGGBf8f/yJ+wdp9ruNy9G5bQrt1p8+GK54bMgx+GqBPyR4KS 8ho1rSrgSMI276acI61DYb7DANKEPmd8lwXGCTaXRbUhT1uO72N06H1/VcxG5QSD wfiwiy7m0= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-3 (Coremail) with SMTP id _____wD3f7xtUOVn1ekMCQ--.39600S4; Thu, 27 Mar 2025 21:19:47 +0800 (CST) From: Wenliang Yan To: linux@roeck-us.net, Christophe JAILLET , Jean Delvare Cc: Wenliang Yan , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jonathan Corbet , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/4] hwmon:(ina238)Add support for SQ52206 Date: Thu, 27 Mar 2025 09:18:39 -0400 Message-Id: <20250327131841.15013-3-wenliang202407@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250327131841.15013-1-wenliang202407@163.com> References: <20250327131841.15013-1-wenliang202407@163.com> X-CM-TRANSID: _____wD3f7xtUOVn1ekMCQ--.39600S4 X-Coremail-Antispam: 1Uf129KBjvJXoW3Cr47uw1UXw4fGrW5AFWfAFb_yoWkGr18pF ZxJayfKr48JFWxW393tr48uF13Gwn7Gr47Ar4kWw1fZFs8J34vvFy2qF4FvFW3K34rZF45 Jr1kt3y5CwsFyw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pRi0ePUUUUU= X-CM-SenderInfo: xzhqzxhdqjjiisuqlqqrwthudrp/xtbBDREd02flUB4HHAAAsF Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for SQ52206 to the Ina238 driver. Add registers, increase compatibility, add compatibility programs for multiple chips. Signed-off-by: Wenliang Yan --- v5->v6:Split the patch, this patch add support for SQ52206: 1.Incorporate four additional registers to the original register set of SQ52206 beyond INA238. 2.The ADC measurement range of SQ52206 is divided into 1/2/4, so change the configuration of INA238_ADC_CONFIG. 3.Add an introduction note to the power and energy formulas 4.Configure the properties of SQ52206 5.Add a 40 bit data reading function to prepare for energy reading. 6.Add peak power reading and add HWMON_P_INPUT_HIGHEST for power. 7.Energy attributes are 5bytes wide, so modified the function for energy1_input to use u64. Current_LSB is 1mA/lsb, so the SQ52206's Energy calculation formula is Energy (mJ) =3D 16 * 0.24 * register value * 1 * 20000 / rshunt / 4 * gain, where 20000 is the default resistance value. 4 is the default gain of 4, 20000*gain/ (rshunt*4) indicates the conversion ratio based on the actual resistance value and the gain ratio. 16 and 0.24 are fixed parameters. 'data->config->power_calculate_factor/100 =3D=3D 0.24'. 8.Add a corresponding compatible to the driver. Documentation/hwmon/ina238.rst | 15 +++++ drivers/hwmon/ina238.c | 113 ++++++++++++++++++++++++++++++--- 2 files changed, 120 insertions(+), 8 deletions(-) diff --git a/Documentation/hwmon/ina238.rst b/Documentation/hwmon/ina238.rst index d9f479984420..d1b93cf8627f 100644 --- a/Documentation/hwmon/ina238.rst +++ b/Documentation/hwmon/ina238.rst @@ -14,6 +14,12 @@ Supported chips: Datasheet: https://www.ti.com/lit/gpn/ina238 =20 + * Silergy SQ52206 + + Prefix: 'SQ52206' + + Addresses: I2C 0x40 - 0x4f + Author: Nathan Rossi =20 Description @@ -54,3 +60,12 @@ temp1_input Die temperature measurement (mC) temp1_max Maximum die temperature threshold (mC) temp1_max_alarm Maximum die temperature alarm =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D + +Additional sysfs entries for sq52206 +------------------------------------ + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D +energy1_input Energy measurement (mJ) + +power1_input_highest Peak Power (uW) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D diff --git a/drivers/hwmon/ina238.c b/drivers/hwmon/ina238.c index c8d6bd3041b3..1bf4c850b04d 100644 --- a/drivers/hwmon/ina238.c +++ b/drivers/hwmon/ina238.c @@ -21,11 +21,14 @@ #define INA238_CONFIG 0x0 #define INA238_ADC_CONFIG 0x1 #define INA238_SHUNT_CALIBRATION 0x2 +#define SQ52206_SHUNT_TEMPCO 0x3 #define INA238_SHUNT_VOLTAGE 0x4 #define INA238_BUS_VOLTAGE 0x5 #define INA238_DIE_TEMP 0x6 #define INA238_CURRENT 0x7 #define INA238_POWER 0x8 +#define SQ52206_ENERGY 0x9 +#define SQ52206_CHARGE 0xa #define INA238_DIAG_ALERT 0xb #define INA238_SHUNT_OVER_VOLTAGE 0xc #define INA238_SHUNT_UNDER_VOLTAGE 0xd @@ -33,9 +36,12 @@ #define INA238_BUS_UNDER_VOLTAGE 0xf #define INA238_TEMP_LIMIT 0x10 #define INA238_POWER_LIMIT 0x11 +#define SQ52206_POWER_PEAK 0x20 #define INA238_DEVICE_ID 0x3f /* not available on INA237 */ =20 #define INA238_CONFIG_ADCRANGE BIT(4) +#define SQ52206_CONFIG_ADCRANGE_HIGH BIT(4) +#define SQ52206_CONFIG_ADCRANGE_LOW BIT(3) =20 #define INA238_DIAG_ALERT_TMPOL BIT(7) #define INA238_DIAG_ALERT_SHNTOL BIT(6) @@ -44,12 +50,13 @@ #define INA238_DIAG_ALERT_BUSUL BIT(3) #define INA238_DIAG_ALERT_POL BIT(2) =20 -#define INA238_REGISTERS 0x11 +#define INA238_REGISTERS 0x20 =20 #define INA238_RSHUNT_DEFAULT 10000 /* uOhm */ =20 /* Default configuration of device on reset. */ #define INA238_CONFIG_DEFAULT 0 +#define SQ52206_CONFIG_DEFAULT 0x0005 /* 16 sample averaging, 1052us conversion time, continuous mode */ #define INA238_ADC_CONFIG_DEFAULT 0xfb6a /* Configure alerts to be based on averaged value (SLOWALERT) */ @@ -87,14 +94,19 @@ * shunt =3D 0x4000 / (819.2 * 10^6) / 0.001 =3D 20000 uOhms (with 1mA/ls= b) * * Current (mA) =3D register value * 20000 / rshunt / 4 * gain - * Power (W) =3D 0.2 * register value * 20000 / rshunt / 4 * gain + * Power (mW) =3D 0.2 * register value * 20000 / rshunt / 4 * gain + * (Specific for SQ52206) + * Power (mW) =3D 0.24 * register value * 20000 / rshunt / 4 * gain + * Energy (mJ) =3D 16 * 0.24 * register value * 20000 / rshunt / 4 * gain */ #define INA238_CALIBRATION_VALUE 16384 #define INA238_FIXED_SHUNT 20000 =20 #define INA238_SHUNT_VOLTAGE_LSB 5 /* 5 uV/lsb */ #define INA238_BUS_VOLTAGE_LSB 3125 /* 3.125 mV/lsb */ -#define INA238_DIE_TEMP_LSB 125 /* 125 mC/lsb */ +#define INA238_DIE_TEMP_LSB 1250000 /* 125.0000 mC/lsb */ +#define SQ52206_BUS_VOLTAGE_LSB 3750 /* 3.75 mV/lsb */ +#define SQ52206_DIE_TEMP_LSB 78125 /* 7.8125 mC/lsb */ =20 static const struct regmap_config ina238_regmap_config =3D { .max_register =3D INA238_REGISTERS, @@ -102,7 +114,7 @@ static const struct regmap_config ina238_regmap_config = =3D { .val_bits =3D 16, }; =20 -enum ina238_ids { ina238, ina237 }; +enum ina238_ids { ina238, ina237, sq52206 }; =20 struct ina238_config { bool has_power_highest; /* chip detection power peak */ @@ -142,6 +154,15 @@ static const struct ina238_config ina238_config[] =3D { .bus_voltage_lsb =3D INA238_BUS_VOLTAGE_LSB, .temp_lsb =3D INA238_DIE_TEMP_LSB, }, + [sq52206] =3D { + .has_energy =3D true, + .has_power_highest =3D true, + .temp_shift =3D 0, + .power_calculate_factor =3D 24, + .config_default =3D SQ52206_CONFIG_DEFAULT, + .bus_voltage_lsb =3D SQ52206_BUS_VOLTAGE_LSB, + .temp_lsb =3D SQ52206_DIE_TEMP_LSB, + }, }; =20 static int ina238_read_reg24(const struct i2c_client *client, u8 reg, u32 = *val) @@ -160,6 +181,24 @@ static int ina238_read_reg24(const struct i2c_client *= client, u8 reg, u32 *val) return 0; } =20 +static int ina238_read_reg40(const struct i2c_client *client, u8 reg, u64 = *val) +{ + u8 data[5]; + u32 low; + int err; + + /* 40-bit register read */ + err =3D i2c_smbus_read_i2c_block_data(client, reg, 5, data); + if (err < 0) + return err; + if (err !=3D 5) + return -EIO; + low =3D (data[1] << 24) | (data[2] << 16) | (data[3] << 8) | data[4]; + *val =3D ((long long)data[0] << 32) | low; + + return 0; +} + static int ina238_read_in(struct device *dev, u32 attr, int channel, long *val) { @@ -330,6 +369,17 @@ static int ina238_read_power(struct device *dev, u32 a= ttr, long *val) if (err) return err; =20 + /* Fixed 1mA lsb, scaled by 1000000 to have result in uW */ + power =3D div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * + data->gain, 20 * data->rshunt); + /* Clamp value to maximum value of long */ + *val =3D clamp_val(power, 0, LONG_MAX); + break; + case hwmon_power_input_highest: + err =3D ina238_read_reg24(data->client, SQ52206_POWER_PEAK, ®val); + if (err) + return err; + /* Fixed 1mA lsb, scaled by 1000000 to have result in uW */ power =3D div_u64(regval * 1000ULL * INA238_FIXED_SHUNT * data->gain, 20 * data->rshunt); @@ -437,6 +487,25 @@ static int ina238_write_temp(struct device *dev, u32 a= ttr, long val) return regmap_write(data->regmap, INA238_TEMP_LIMIT, regval); } =20 +static ssize_t energy1_input_show(struct device *dev, + struct device_attribute *da, char *buf) +{ + struct ina238_data *data =3D dev_get_drvdata(dev); + int ret; + u64 regval; + u64 energy; + + ret =3D ina238_read_reg40(data->client, SQ52206_ENERGY, ®val); + if (ret) + return ret; + + /* result in mJ */ + energy =3D div_u64(regval * INA238_FIXED_SHUNT * data->gain * 16 * + data->config->power_calculate_factor, 4 * 100 * data->rshunt); + + return sysfs_emit(buf, "%llu\n", energy); +} + static int ina238_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, long *val) { @@ -486,6 +555,9 @@ static umode_t ina238_is_visible(const void *drvdata, enum hwmon_sensor_types type, u32 attr, int channel) { + const struct ina238_data *data =3D drvdata; + bool has_power_highest =3D data->config->has_power_highest; + switch (type) { case hwmon_in: switch (attr) { @@ -513,6 +585,10 @@ static umode_t ina238_is_visible(const void *drvdata, return 0444; case hwmon_power_max: return 0644; + case hwmon_power_input_highest: + if (has_power_highest) + return 0444; + return 0; default: return 0; } @@ -546,7 +622,8 @@ static const struct hwmon_channel_info * const ina238_i= nfo[] =3D { HWMON_C_INPUT), HWMON_CHANNEL_INFO(power, /* 0: power */ - HWMON_P_INPUT | HWMON_P_MAX | HWMON_P_MAX_ALARM), + HWMON_P_INPUT | HWMON_P_MAX | + HWMON_P_MAX_ALARM | HWMON_P_INPUT_HIGHEST), HWMON_CHANNEL_INFO(temp, /* 0: die temperature */ HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_ALARM), @@ -564,6 +641,15 @@ static const struct hwmon_chip_info ina238_chip_info = =3D { .info =3D ina238_info, }; =20 +/* energy attributes are 5 bytes wide so we need u64 */ +static DEVICE_ATTR_RO(energy1_input); + +static struct attribute *ina238_attrs[] =3D { + &dev_attr_energy1_input.attr, + NULL, +}; +ATTRIBUTE_GROUPS(ina238); + static int ina238_probe(struct i2c_client *client) { struct ina2xx_platform_data *pdata =3D dev_get_platdata(&client->dev); @@ -604,14 +690,19 @@ static int ina238_probe(struct i2c_client *client) /* load shunt gain value */ if (device_property_read_u32(dev, "ti,shunt-gain", &data->gain) < 0) data->gain =3D 4; /* Default of ADCRANGE =3D 0 */ - if (data->gain !=3D 1 && data->gain !=3D 4) { + if (data->gain !=3D 1 && data->gain !=3D 2 && data->gain !=3D 4) { dev_err(dev, "invalid shunt gain value %u\n", data->gain); return -EINVAL; } =20 /* Setup CONFIG register */ config =3D data->config->config_default; - if (data->gain =3D=3D 1) + if (chip =3D=3D sq52206) { + if (data->gain =3D=3D 1) + config |=3D SQ52206_CONFIG_ADCRANGE_HIGH; /* ADCRANGE =3D 10/11 is /1 */ + else if (data->gain =3D=3D 2) + config |=3D SQ52206_CONFIG_ADCRANGE_LOW; /* ADCRANGE =3D 01 is /2 */ + } else if (data->gain =3D=3D 1) config |=3D INA238_CONFIG_ADCRANGE; /* ADCRANGE =3D 1 is /1 */ ret =3D regmap_write(data->regmap, INA238_CONFIG, config); if (ret < 0) { @@ -645,7 +736,8 @@ static int ina238_probe(struct i2c_client *client) =20 hwmon_dev =3D devm_hwmon_device_register_with_info(dev, client->name, dat= a, &ina238_chip_info, - NULL); + data->config->has_energy ? + ina238_groups : NULL); if (IS_ERR(hwmon_dev)) return PTR_ERR(hwmon_dev); =20 @@ -658,6 +750,7 @@ static int ina238_probe(struct i2c_client *client) static const struct i2c_device_id ina238_id[] =3D { { "ina237", ina237 }, { "ina238", ina238 }, + { "sq52206", sq52206 }, { } }; MODULE_DEVICE_TABLE(i2c, ina238_id); @@ -671,6 +764,10 @@ static const struct of_device_id __maybe_unused ina238= _of_match[] =3D { .compatible =3D "ti,ina238", .data =3D (void *)ina238 }, + { + .compatible =3D "silergy,sq52206", + .data =3D (void *)sq52206 + }, { } }; MODULE_DEVICE_TABLE(of, ina238_of_match); --=20 2.17.1