diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 16:06:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 16:06:58 -0800 |
| commit | 962f08f8596bfbb54f3978d9c7e649bedf92c7f0 (patch) | |
| tree | 32511d2c6c3963b47d462508b3dcc05dd64f7ceb /include/linux | |
| parent | 6997e172dc529b9f6780ae71fc7eaea31ece8b25 (diff) | |
| parent | fb3b07ef399bd6984f3361a709829618b75e98d8 (diff) | |
Merge tag 'scpi-for-v4.6/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers
SCPI updates and fixes for v4.6
1. Minor fix to restore functionality in big-endian mode
2. Fix race by decreasing Tx timeout to 20ms
3. Adds support for 64-bit sensor values and energy meter
* tag 'scpi-for-v4.6/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
hwmon: (scpi) add energy meter support
firmware: arm_scpi: add support for 64-bit sensor values
firmware: arm_scpi: decrease Tx timeout to 20ms
firmware: arm_scpi: fix send_message and sensor_get_value for big-endian
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/scpi_protocol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h index 72ce932c69b2..35de50a65665 100644 --- 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 { @@ -68,7 +69,7 @@ struct scpi_ops { struct scpi_dvfs_info *(*dvfs_get_info)(u8); int (*sensor_get_capability)(u16 *sensors); int (*sensor_get_info)(u16 sensor_id, struct scpi_sensor_info *); - int (*sensor_get_value)(u16, u32 *); + int (*sensor_get_value)(u16, u64 *); }; #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL) |