hwmon: (core) Add energy and humidity attribute support to new API

[mirror_ubuntu-zesty-kernel.git] / include / linux / hwmon.h

diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index d7e432ef7c2a94388ef4fe5b15fef19ceacf5060..57d92f1d779b0dd6dea752a2c5f9abfa24ea382f 100644 (file)
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -26,6 +26,7 @@ enum hwmon_sensor_types {
        hwmon_curr,
        hwmon_power,
        hwmon_energy,
+       hwmon_humidity,
 };
 
 enum hwmon_chip_attributes {
@@ -216,6 +217,34 @@ enum hwmon_power_attributes {
 #define HWMON_P_MAX_ALARM              BIT(hwmon_power_max_alarm)
 #define HWMON_P_CRIT_ALARM             BIT(hwmon_power_crit_alarm)
 
+enum hwmon_energy_attributes {
+       hwmon_energy_input,
+       hwmon_energy_label,
+};
+
+#define HWMON_E_INPUT                  BIT(hwmon_energy_input)
+#define HWMON_E_LABEL                  BIT(hwmon_energy_label)
+
+enum hwmon_humidity_attributes {
+       hwmon_humidity_input,
+       hwmon_humidity_label,
+       hwmon_humidity_min,
+       hwmon_humidity_min_hyst,
+       hwmon_humidity_max,
+       hwmon_humidity_max_hyst,
+       hwmon_humidity_alarm,
+       hwmon_humidity_fault,
+};
+
+#define HWMON_H_INPUT                  BIT(hwmon_humidity_input)
+#define HWMON_H_LABEL                  BIT(hwmon_humidity_label)
+#define HWMON_H_MIN                    BIT(hwmon_humidity_min)
+#define HWMON_H_MIN_HYST               BIT(hwmon_humidity_min_hyst)
+#define HWMON_H_MAX                    BIT(hwmon_humidity_max)
+#define HWMON_H_MAX_HYST               BIT(hwmon_humidity_max_hyst)
+#define HWMON_H_ALARM                  BIT(hwmon_humidity_alarm)
+#define HWMON_H_FAULT                  BIT(hwmon_humidity_fault)
+
 /**
  * struct hwmon_ops - hwmon device operations
  * @is_visible: Callback to return attribute visibility. Mandatory.