AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

hwmon: (iio_hwmon) Enable power exporting from IIO

Browse Source 
There is no reason why power channel shouldn't be exported as is done for
voltage, current, temperature and humidity.

Power channel is available on iio ina226 driver.

Sysfs IIO documentation for power attribute added by commit 7c6d5c7ee8
("iio: Documentation: Add missing documentation for power attribute")
is declaring that value is in mili-Watts but hwmon interface is expecting
value in micro-Watts that's why there is a need for mili-Watts to
micro-Watts conversion.

Tested on Xilinx ZCU102 board.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/db71f5ae87e4521a2856a1be5544de0b6cede575.1566483741.git.michal.simek@xilinx.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Michal Simek 2019-08-22 16:22:24 +02:00 committed by Guenter Roeck
parent be7ec9196b
commit bc34301b10
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/hwmon/iio_hwmon.c
View File

@ -44,12 +44,20 @@ static ssize_t iio_hwmon_read_val(struct device *dev,
int ret; int ret;
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
struct iio_hwmon_state *state = dev_get_drvdata(dev); struct iio_hwmon_state *state = dev_get_drvdata(dev);
struct iio_channel *chan = &state->channels[sattr->index];
enum iio_chan_type type;
ret = iio_read_channel_processed(&state->channels[sattr->index], ret = iio_read_channel_processed(chan, &result);
&result);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = iio_get_channel_type(chan, &type);
if (ret < 0)
return ret;
if (type == IIO_POWER)
result *= 1000; /* mili-Watts to micro-Watts conversion */
return sprintf(buf, "%d\n", result); return sprintf(buf, "%d\n", result);
} }
@ -59,7 +67,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
struct iio_hwmon_state *st; struct iio_hwmon_state *st;
struct sensor_device_attribute *a; struct sensor_device_attribute *a;
int ret, i; int ret, i;
int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1; int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1, power_i = 1;
enum iio_chan_type type; enum iio_chan_type type;
struct iio_channel *channels; struct iio_channel *channels;
struct device *hwmon_dev; struct device *hwmon_dev;
@ -114,6 +122,10 @@ static int iio_hwmon_probe(struct platform_device *pdev)
n = curr_i++; n = curr_i++;
prefix = "curr"; prefix = "curr";
break; break;
case IIO_POWER:
n = power_i++;
prefix = "power";
break;
case IIO_HUMIDITYRELATIVE: case IIO_HUMIDITYRELATIVE:
n = humidity_i++; n = humidity_i++;
prefix = "humidity"; prefix = "humidity";