Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / include / linux / scpi_protocol.h

diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
index 72ce932..35de50a 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 {
@@ -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)