Merge tag 'hwmon-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[linux-2.6-block.git] / drivers / hwmon / aquacomputer_d5next.c

diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c
index 2efe97f8d003c815267295e121021ff4b65411e1..8e55cd2f46f53ed5f88258edc9239b842a8bbc4d 100644 (file)
--- a/drivers/hwmon/aquacomputer_d5next.c
+++ b/drivers/hwmon/aquacomputer_d5next.c
@@ -202,16 +202,19 @@ static u16 aquastreamult_sensor_fan_offsets[] = { AQUASTREAMULT_FAN_OFFSET };
 #define OCTO_NUM_FANS                  8
 #define OCTO_NUM_SENSORS               4
 #define OCTO_NUM_VIRTUAL_SENSORS       16
+#define OCTO_NUM_FLOW_SENSORS          1
 #define OCTO_CTRL_REPORT_SIZE          0x65F
 
 /* Sensor report offsets for the Octo */
 #define OCTO_POWER_CYCLES              0x18
 #define OCTO_SENSOR_START              0x3D
 #define OCTO_VIRTUAL_SENSORS_START     0x45
+#define OCTO_FLOW_SENSOR_OFFSET                0x7B
 static u16 octo_sensor_fan_offsets[] = { 0x7D, 0x8A, 0x97, 0xA4, 0xB1, 0xBE, 0xCB, 0xD8 };
 
 /* Control report offsets for the Octo */
 #define OCTO_TEMP_CTRL_OFFSET          0xA
+#define OCTO_FLOW_PULSES_CTRL_OFFSET   0x6
 /* Fan speed offsets (0-100%) */
 static u16 octo_ctrl_fan_offsets[] = { 0x5B, 0xB0, 0x105, 0x15A, 0x1AF, 0x204, 0x259, 0x2AE };
 
@@ -363,18 +366,6 @@ static const char *const label_aquaero_calc_temp_sensors[] = {
        "Calc. virtual sensor 4"
 };
 
-/* Labels for Octo and Quadro (except speed) */
-static const char *const label_fan_speed[] = {
-       "Fan 1 speed",
-       "Fan 2 speed",
-       "Fan 3 speed",
-       "Fan 4 speed",
-       "Fan 5 speed",
-       "Fan 6 speed",
-       "Fan 7 speed",
-       "Fan 8 speed"
-};
-
 static const char *const label_fan_power[] = {
        "Fan 1 power",
        "Fan 2 power",
@@ -408,6 +399,19 @@ static const char *const label_fan_current[] = {
        "Fan 8 current"
 };
 
+/* Labels for Octo fan speeds */
+static const char *const label_octo_speeds[] = {
+       "Fan 1 speed",
+       "Fan 2 speed",
+       "Fan 3 speed",
+       "Fan 4 speed",
+       "Fan 5 speed",
+       "Fan 6 speed",
+       "Fan 7 speed",
+       "Fan 8 speed",
+       "Flow speed [dL/h]",
+};
+
 /* Labels for Quadro fan speeds */
 static const char *const label_quadro_speeds[] = {
        "Fan 1 speed",
@@ -844,6 +848,7 @@ static umode_t aqc_is_visible(const void *data, enum hwmon_sensor_types type, u3
                                        return 0444;
                                break;
                        case aquaero:
+                       case octo:
                        case quadro:
                        case highflow:
                                /* Special case to support flow sensors */
@@ -857,9 +862,16 @@ static umode_t aqc_is_visible(const void *data, enum hwmon_sensor_types type, u3
                        }
                        break;
                case hwmon_fan_pulses:
-                       /* Special case for Quadro flow sensor */
-                       if (priv->kind == quadro && channel == priv->num_fans)
-                               return 0644;
+                       /* Special case for Quadro/Octo flow sensor */
+                       if (channel == priv->num_fans) {
+                               switch (priv->kind) {
+                               case quadro:
+                               case octo:
+                                       return 0644;
+                               default:
+                                       break;
+                               }
+                       }
                        break;
                case hwmon_fan_min:
                case hwmon_fan_max:
@@ -1289,7 +1301,8 @@ static const struct hwmon_channel_info * const aqc_info[] = {
                           HWMON_F_INPUT | HWMON_F_LABEL | HWMON_F_PULSES,
                           HWMON_F_INPUT | HWMON_F_LABEL,
                           HWMON_F_INPUT | HWMON_F_LABEL,
-                          HWMON_F_INPUT | HWMON_F_LABEL),
+                          HWMON_F_INPUT | HWMON_F_LABEL,
+                          HWMON_F_INPUT | HWMON_F_LABEL | HWMON_F_PULSES),
        HWMON_CHANNEL_INFO(power,
                           HWMON_P_INPUT | HWMON_P_LABEL,
                           HWMON_P_INPUT | HWMON_P_LABEL,
@@ -1658,16 +1671,20 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id)
                priv->temp_sensor_start_offset = OCTO_SENSOR_START;
                priv->num_virtual_temp_sensors = OCTO_NUM_VIRTUAL_SENSORS;
                priv->virtual_temp_sensor_start_offset = OCTO_VIRTUAL_SENSORS_START;
+               priv->num_flow_sensors = OCTO_NUM_FLOW_SENSORS;
+               priv->flow_sensors_start_offset = OCTO_FLOW_SENSOR_OFFSET;
+
                priv->temp_ctrl_offset = OCTO_TEMP_CTRL_OFFSET;
 
                priv->buffer_size = OCTO_CTRL_REPORT_SIZE;
                priv->ctrl_report_delay = CTRL_REPORT_DELAY;
 
+               priv->flow_pulses_ctrl_offset = OCTO_FLOW_PULSES_CTRL_OFFSET;
                priv->power_cycle_count_offset = OCTO_POWER_CYCLES;
 
                priv->temp_label = label_temp_sensors;
                priv->virtual_temp_label = label_virtual_temp_sensors;
-               priv->speed_label = label_fan_speed;
+               priv->speed_label = label_octo_speeds;
                priv->power_label = label_fan_power;
                priv->voltage_label = label_fan_voltage;
                priv->current_label = label_fan_current;