[PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support
@ 2022-03-02 12:38 Potin Lai
  2022-03-02 12:38 ` [PATCH v6 1/2] hwmon: (adm1275) Allow setting sample averaging Potin Lai
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Potin Lai @ 2022-03-02 12:38 UTC (permalink / raw)
  To: Guenter Roeck, Jean Delvare, Rob Herring, Krzysztof Kozlowski
  Cc: Patrick Williams, linux-hwmon, linux-kernel, devicetree,
	Potin Lai

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>;
	};

LINK: [v1] https://lore.kernel.org/all/20220223163817.30583-1-potin.lai@quantatw.com/
LINK: [v2] https://lore.kernel.org/all/20220224154329.9755-1-potin.lai@quantatw.com/
LINK: [v3] https://lore.kernel.org/all/20220228103716.10774-1-potin.lai@quantatw.com/
LINK: [v4] https://lore.kernel.org/all/20220301103900.12637-1-potin.lai@quantatw.com/
LINK: [v5] https://lore.kernel.org/all/20220302070831.23822-1-potin.lai@quantatw.com/

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(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v6 1/2] hwmon: (adm1275) Allow setting sample averaging
  2022-03-02 12:38 [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Potin Lai
@ 2022-03-02 12:38 ` Potin Lai
  2022-03-02 12:38 ` [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275 Potin Lai
  2022-03-02 17:58 ` [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Guenter Roeck
  2 siblings, 0 replies; 6+ messages in thread
From: Potin Lai @ 2022-03-02 12:38 UTC (permalink / raw)
  To: Guenter Roeck, Jean Delvare, Rob Herring, Krzysztof Kozlowski
  Cc: Patrick Williams, linux-hwmon, linux-kernel, devicetree,
	Potin Lai

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].

Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
 drivers/hwmon/pmbus/adm1275.c | 40 ++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index d311e0557401..3b07bfb43e93 100644
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -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) {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275
  2022-03-02 12:38 [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Potin Lai
  2022-03-02 12:38 ` [PATCH v6 1/2] hwmon: (adm1275) Allow setting sample averaging Potin Lai
@ 2022-03-02 12:38 ` Potin Lai
  2022-03-02 13:47   ` Krzysztof Kozlowski
  2022-03-02 17:44   ` Rob Herring
  2022-03-02 17:58 ` [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Guenter Roeck
  2 siblings, 2 replies; 6+ messages in thread
From: Potin Lai @ 2022-03-02 12:38 UTC (permalink / raw)
  To: Guenter Roeck, Jean Delvare, Rob Herring, Krzysztof Kozlowski
  Cc: Patrick Williams, linux-hwmon, linux-kernel, devicetree,
	Potin Lai

Add documentation of new properties for sample averaging in PMON_CONFIG
register.

New properties:
- adi,volt-curr-sample-average
- adi,power-sample-average

Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
 .../bindings/hwmon/adi,adm1275.yaml           | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml b/Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml
index 223393d7cafd..ab87f51c5aef 100644
--- a/Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml
+++ b/Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml
@@ -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>;
         };
     };
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275
  2022-03-02 12:38 ` [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275 Potin Lai
@ 2022-03-02 13:47   ` Krzysztof Kozlowski
  2022-03-02 17:44   ` Rob Herring
  1 sibling, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-03-02 13:47 UTC (permalink / raw)
  To: Potin Lai, Guenter Roeck, Jean Delvare, Rob Herring
  Cc: Patrick Williams, linux-hwmon, linux-kernel, devicetree

On 02/03/2022 13:38, Potin Lai wrote:
> Add documentation of new properties for sample averaging in PMON_CONFIG
> register.
> 
> New properties:
> - adi,volt-curr-sample-average
> - adi,power-sample-average
> 
> Signed-off-by: Potin Lai <potin.lai@quantatw.com>
> ---
>  .../bindings/hwmon/adi,adm1275.yaml           | 68 +++++++++++++++++++
>  1 file changed, 68 insertions(+)
> 


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275
  2022-03-02 12:38 ` [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275 Potin Lai
  2022-03-02 13:47   ` Krzysztof Kozlowski
@ 2022-03-02 17:44   ` Rob Herring
  1 sibling, 0 replies; 6+ messages in thread
From: Rob Herring @ 2022-03-02 17:44 UTC (permalink / raw)
  To: Potin Lai
  Cc: Guenter Roeck, Jean Delvare, Krzysztof Kozlowski,
	Patrick Williams, linux-hwmon, linux-kernel, devicetree

On Wed, Mar 02, 2022 at 08:38:17PM +0800, Potin Lai wrote:
> Add documentation of new properties for sample averaging in PMON_CONFIG
> register.
> 
> New properties:
> - adi,volt-curr-sample-average
> - adi,power-sample-average
> 
> Signed-off-by: Potin Lai <potin.lai@quantatw.com>
> ---
>  .../bindings/hwmon/adi,adm1275.yaml           | 68 +++++++++++++++++++
>  1 file changed, 68 insertions(+)

Reviewed-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support
  2022-03-02 12:38 [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Potin Lai
  2022-03-02 12:38 ` [PATCH v6 1/2] hwmon: (adm1275) Allow setting sample averaging Potin Lai
  2022-03-02 12:38 ` [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275 Potin Lai
@ 2022-03-02 17:58 ` Guenter Roeck
  2 siblings, 0 replies; 6+ messages in thread
From: Guenter Roeck @ 2022-03-02 17:58 UTC (permalink / raw)
  To: Potin Lai
  Cc: Jean Delvare, Rob Herring, Krzysztof Kozlowski, Patrick Williams,
	linux-hwmon, linux-kernel, devicetree

On Wed, Mar 02, 2022 at 08:38:15PM +0800, Potin Lai wrote:
> This patch series allow user config PWR_AVG and VI_AVG in PMON_CONF
> register by adding properties in device tree.
> 

Series applied to hwmon-next.

Thanks,
Guenter

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-03-02 17:58 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-02 12:38 [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Potin Lai
2022-03-02 12:38 ` [PATCH v6 1/2] hwmon: (adm1275) Allow setting sample averaging Potin Lai
2022-03-02 12:38 ` [PATCH v6 2/2] dt-bindings: hwmon: Add sample averaging properties for ADM1275 Potin Lai
2022-03-02 13:47   ` Krzysztof Kozlowski
2022-03-02 17:44   ` Rob Herring
2022-03-02 17:58 ` [PATCH v6 0/2] hwmon: (adm1275) Add sample averaging binding support Guenter Roeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox