summaryrefslogtreecommitdiff
path: root/drivers/hwmon/scpi-hwmon.c
diff options
context:
space:
mode:
authorSudeep Holla <sudeep.holla@arm.com>2016-01-25 13:53:38 +0300
committerSudeep Holla <sudeep.holla@arm.com>2016-02-16 12:26:27 +0300
commitfb3b07ef399bd6984f3361a709829618b75e98d8 (patch)
tree55d75f9fd410020a3195b4708a59b071781efc2f /drivers/hwmon/scpi-hwmon.c
parent2e8741599cf128ea27674d9ae93b46e847f820b4 (diff)
downloadlinux-fb3b07ef399bd6984f3361a709829618b75e98d8.tar.xz
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>
Diffstat (limited to 'drivers/hwmon/scpi-hwmon.c')
-rw-r--r--drivers/hwmon/scpi-hwmon.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c
index 7101b14b5137..912b449c8303 100644
--- 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;
}