]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
hwmon: (asus-ec-sensors) add ROG MAXIMUS Z90 Formula.
authorDaniel Grainger <dagr@live.ca>
Thu, 1 May 2025 13:19:53 +0000 (15:19 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Fri, 2 May 2025 03:05:40 +0000 (20:05 -0700)
Board and chipset information is from LibreHardwareMonitor [1].

[1] https://github.com/LibreHardwareMonitor/LibreHardwareMonitor

Signed-off-by: Daniel Grainger <dagr@live.ca>
Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
Link: https://lore.kernel.org/r/20250501132009.726742-1-eugene.shalygin@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Documentation/hwmon/asus_ec_sensors.rst
drivers/hwmon/asus-ec-sensors.c

index d2be9db2961485e342aa833a3d6f24a16009bfd5..3f5a2d1ffe651ad75fa963e7587b87fba4619b07 100644 (file)
@@ -20,6 +20,7 @@ Supported boards:
  * ROG CROSSHAIR X670E GENE
  * ROG MAXIMUS XI HERO
  * ROG MAXIMUS XI HERO (WI-FI)
+ * ROG MAXIMUS Z690 FORMULA
  * ROG STRIX B550-E GAMING
  * ROG STRIX B550-I GAMING
  * ROG STRIX X570-E GAMING
index 7f2389db89237dd850ddca29d4d88d3a686c4d12..d1f91376231873434807c1629a9b14a181a6ea58 100644 (file)
@@ -283,6 +283,14 @@ static const struct ec_sensor_info sensors_family_intel_600[] = {
        [ec_sensor_temp_t_sensor] =
                EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x00, 0x3d),
        [ec_sensor_temp_vrm] = EC_SENSOR("VRM", hwmon_temp, 1, 0x00, 0x3e),
+       [ec_sensor_fan_water_flow] =
+               EC_SENSOR("Water_Flow", hwmon_fan, 2, 0x00, 0xbe),
+       [ec_sensor_temp_water_in] =
+               EC_SENSOR("Water_In", hwmon_temp, 1, 0x01, 0x00),
+       [ec_sensor_temp_water_out] =
+               EC_SENSOR("Water_Out", hwmon_temp, 1, 0x01, 0x01),
+       [ec_sensor_temp_water_block_in] =
+               EC_SENSOR("Water_Block_In", hwmon_temp, 1, 0x01, 0x02),
 };
 
 /* Shortcuts for common combinations */
@@ -407,6 +415,13 @@ static const struct ec_board_info board_info_maximus_xi_hero = {
        .family = family_intel_300_series,
 };
 
+static const struct ec_board_info board_info_maximus_z690_formula = {
+       .sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
+               SENSOR_SET_TEMP_WATER | SENSOR_FAN_WATER_FLOW,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
+       .family = family_intel_600_series,
+};
+
 static const struct ec_board_info board_info_crosshair_viii_impact = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
                SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
@@ -542,6 +557,8 @@ static const struct dmi_system_id dmi_table[] = {
                                        &board_info_maximus_xi_hero),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO (WI-FI)",
                                        &board_info_maximus_xi_hero),
+       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS Z690 FORMULA",
+                                       &board_info_maximus_z690_formula),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII IMPACT",
                                        &board_info_crosshair_viii_impact),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX B550-E GAMING",