Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

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

diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 74e89d4..9d2f8bd 100644 (file)
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -28,6 +28,7 @@ enum hwmon_sensor_types {
        hwmon_energy,
        hwmon_humidity,
        hwmon_fan,
+       hwmon_pwm,
 };
 
 enum hwmon_chip_attributes {
@@ -272,6 +273,18 @@ enum hwmon_fan_attributes {
 #define HWMON_F_MAX_ALARM              BIT(hwmon_fan_max_alarm)
 #define HWMON_F_FAULT                  BIT(hwmon_fan_fault)
 
+enum hwmon_pwm_attributes {
+       hwmon_pwm_input,
+       hwmon_pwm_enable,
+       hwmon_pwm_mode,
+       hwmon_pwm_freq,
+};
+
+#define HWMON_PWM_INPUT                        BIT(hwmon_pwm_input)
+#define HWMON_PWM_ENABLE               BIT(hwmon_pwm_enable)
+#define HWMON_PWM_MODE                 BIT(hwmon_pwm_mode)
+#define HWMON_PWM_FREQ                 BIT(hwmon_pwm_freq)
+
 /**
  * struct hwmon_ops - hwmon device operations
  * @is_visible: Callback to return attribute visibility. Mandatory.