hwmon: (adm1275) Add sample averaging binding support
Subsystems (2)
v6 cover hwmon: (adm1275) Add sample averaging binding support
This patch series allow user config PWR_AVG and VI_AVG in PMON_CONF register by adding properties in device tree.
Example:
adm1278@11 {
compatible = "adi,adm1278";
......
adi,volt-curr-sample-average = <128>;
adi,power-sample-average = <128>;
};Changes v5 --> v6:
- update and fix the yaml file error reported form bt_binding_check
Changes v4 --> v5:
- remove "adi,power-sample-average-enable" property, just set number of sampling to 1 as disabling sample averaging, and set 2 .. 128 as enabling.
- update correct default value (from datasheet) in if-block of each chip, and set "adi,power-sample-average" to false if not allowed.
- change adm1278 pmon_config smbus write "byte" to "word" in probe, adm1278 pmon_config register has 2 bytes data length.
Changes v3 --> v4:
- add "adi,power-sample-average-enable" property
- add sample number cehcking in driver, only allow listed value
- remove info logging, add error log when invalid number detected
Changes v2 --> v3:
- change property type back to u32, use logical value instead of register value
- fix typo in properties description
- add if-block to descript "adi,power-sample-average" not alloed if compatible not in the enum list
Changes v1 --> v2:
- use more descriptive property name
- change property type from u32 to u8
- add property value check, valid range between 1 and 7
Potin Lai (2):
hwmon: (adm1275) Allow setting sample averaging
dt-bindings: hwmon: Add sample averaging properties for ADM1275
.../bindings/hwmon/adi,adm1275.yaml | 68 +++++++++++++++++++ drivers/hwmon/pmbus/adm1275.c | 40 ++++++++++- 2 files changed, 107 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
PATCH v6 1/2 hwmon: (adm1275) Allow setting sample averaging
Current driver assume PWR_AVG and VI_AVG as 1 by default, and user needs to set sample averaging via sysfs manually.
This patch parses the properties "adi,power-sample-average" and "adi,volt-curr-sample-average" from device tree, and setting sample averaging during probe. Input value must be one of value in the list [1, 2, 4, 8, 16, 32, 64, 128].
--- drivers/hwmon/pmbus/adm1275.c | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1275.c +39 -1
@@ -475,6 +475,7 @@ static int adm1275_probe(struct i2c_client *client)int vindex =-1 , voindex =-1 , cindex =-1 , pindex =-1 ;int tindex =-1 ;u32 shunt; +u32 avg; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA
@@ -687,7 +688,7 @@ static int adm1275_probe(struct i2c_client *client)if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_byte_data (client, + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config);if (ret <0 ) {
@@ -756,6 +757,43 @@ static int adm1275_probe(struct i2c_client *client)return -ENODEV ; } +if (data->have_power_sampling && +of_property_read_u32 (client->dev.of_node, +"adi,power-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of power samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, true, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting power sample averaging failed with error %d" , + ret); +return ret; + } + } + +if (of_property_read_u32 (client->dev.of_node, +"adi,volt-curr-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of voltage/current samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, false, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting voltage and current sample averaging failed with error %d" , + ret); +return ret; + } + } +if (voindex <0 ) voindex = vindex;if (vindex >=0 ) {
Signature · 1 line
2.17.1
PATCH v6 2/2 dt-bindings: hwmon: Add sample averaging properties for ADM1275
In reply to Potin LaiAdd documentation of new properties for sample averaging in PMON_CONFIG register.
New properties:
- adi,volt-curr-sample-average
- adi,power-sample-average
--- .../bindings/hwmon/adi,adm1275.yaml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+)
Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml +68 -0
@@ -37,6 +37,72 @@ properties: description: Shunt resistor value in micro-Ohm. + adi,volt-curr-sample-average: + description: | + Number of samples to be used to report voltage and current values. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [1, 2, 4, 8, 16, 32, 64, 128] + + adi,power-sample-average: + description: | + Number of samples to be used to report power values. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [1, 2, 4, 8, 16, 32, 64, 128] + +allOf: + - if: + properties: + compatible: + contains: + enum: + - adi,adm1075 + - adi,adm1276 + then: + properties: + adi,volt-curr-sample-average: + default: 128 + adi,power-sample-average: false + + - if: + properties: + compatible: + contains: + enum: + - adi,adm1275 + then: + properties: + adi,volt-curr-sample-average: + default: 16 + adi,power-sample-average: false + + - if: + properties: + compatible: + contains: + enum: + - adi,adm1272 + then: + properties: + adi,volt-curr-sample-average: + default: 128 + adi,power-sample-average: + default: 128 + + - if: + properties: + compatible: + contains: + enum: + - adi,adm1278 + - adi,adm1293 + - adi,adm1294 + then: + properties: + adi,volt-curr-sample-average: + default: 128 + adi,power-sample-average: + default: 1 + required: - compatible - reg
@@ -53,5 +119,7 @@ examples: compatible = "adi,adm1272"; reg = <0x10>; shunt-resistor-micro-ohms = <500>; + adi,volt-curr-sample-average = <128>; + adi,power-sample-average = <128>; }; };
Signature · 1 line
2.17.1
Re: [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275
Quoted 12 lines · Potin Lai
Add documentation of new properties for sample averaging in
PMON_CONFIGregister.New properties:
- adi,volt-curr-sample-average
- adi,power-sample-averageSigned-off-by Potin Lai <[email protected]>--- .../bindings/hwmon/adi,adm1275.yaml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+)
Best regards,
Krzysztof
Re: [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275
In reply to Potin LaiQuoted 11 lines · Potin Lai
Add documentation of new properties for sample averaging in
PMON_CONFIGregister.New properties:
- adi,volt-curr-sample-average
- adi,power-sample-averageSigned-off-by Potin Lai <[email protected]>--- .../bindings/hwmon/adi,adm1275.yaml | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+)
Guenter Roeck
maintainerQuoted 3 lines · Potin Lai
This patch series allow user config
PWR_AVGandVI_AVGinPMON_CONFregister by adding properties in device tree.
Series applied to hwmon-next.
Thanks,
Guenter