hwmon: (scpi) add energy meter support

SCPI specification v1.1 adds support for energy sensors. This patch
adds support for the same.

Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Punit Agrawal <punit.agrawal@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 7101b14b51374d90034c518f23e50224efafaba3..912b449c83038b0402391fc50503b930066f874c 100644 (file)
--- a/drivers/hwmon/scpi-hwmon.c
+++ b/drivers/hwmon/scpi-hwmon.c
@@ -114,6 +114,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
 {
        u16 nr_sensors, i;
        int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0;
+       int num_energy = 0;
        struct scpi_ops *scpi_ops;
        struct device *hwdev, *dev = &pdev->dev;
        struct scpi_sensors *scpi_sensors;
@@ -182,6 +183,13 @@ static int scpi_hwmon_probe(struct platform_device *pdev)
                                 "power%d_label", num_power + 1);
                        num_power++;
                        break;
+               case ENERGY:
+                       snprintf(sensor->input, sizeof(sensor->input),
+                                "energy%d_input", num_energy + 1);
+                       snprintf(sensor->label, sizeof(sensor->input),
+                                "energy%d_label", num_energy + 1);
+                       num_energy++;
+                       break;
                default:
                        continue;
                }

diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
index ecd248d46281d7832fa27290820bf0ae75cc8acb..35de50a65665a188e9a9dbdbe6763655a13ccf1b 100644 (file)
--- a/include/linux/scpi_protocol.h
+++ b/include/linux/scpi_protocol.h
@@ -33,6 +33,7 @@ enum scpi_sensor_class {
        VOLTAGE,
        CURRENT,
        POWER,
+       ENERGY,
 };
 
 struct scpi_sensor_info {