Skip to content

Commit fe5dbe3

Browse files
kotarou3groeck
authored andcommitted
hwmon: (asus-ec-sensors) correct Pro WS TRX50-SAGE WIFI entry
Add missing temperature and fan sensors to Pro WS TRX50-SAGE WIFI Also: - Format VRM names to match the BIOS - Fix swapped VRM_E and VRM_W entries Signed-off-by: 小太 <nospam@kota.moe> Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com> Link: https://lore.kernel.org/r/20251125040140.277756-1-eugene.shalygin@gmail.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent fe598ab commit fe5dbe3

1 file changed

Lines changed: 19 additions & 7 deletions

File tree

drivers/hwmon/asus-ec-sensors.c

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,19 @@ enum ec_sensors {
113113
ec_sensor_temp_t_sensor,
114114
/* VRM temperature [℃] */
115115
ec_sensor_temp_vrm,
116+
/* VRM east (right) temperature [℃] */
117+
ec_sensor_temp_vrme,
118+
/* VRM west (left) temperature [℃] */
119+
ec_sensor_temp_vrmw,
116120
/* CPU Core voltage [mV] */
117121
ec_sensor_in_cpu_core,
118122
/* CPU_Opt fan [RPM] */
119123
ec_sensor_fan_cpu_opt,
120124
/* VRM heat sink fan [RPM] */
121125
ec_sensor_fan_vrm_hs,
122-
/* VRM east heat sink fan [RPM] */
126+
/* VRM east (right) heat sink fan [RPM] */
123127
ec_sensor_fan_vrme_hs,
124-
/* VRM west heat sink fan [RPM] */
128+
/* VRM west (left) heat sink fan [RPM] */
125129
ec_sensor_fan_vrmw_hs,
126130
/* Chipset fan [RPM] */
127131
ec_sensor_fan_chipset,
@@ -157,6 +161,8 @@ enum ec_sensors {
157161
#define SENSOR_TEMP_MB BIT(ec_sensor_temp_mb)
158162
#define SENSOR_TEMP_T_SENSOR BIT(ec_sensor_temp_t_sensor)
159163
#define SENSOR_TEMP_VRM BIT(ec_sensor_temp_vrm)
164+
#define SENSOR_TEMP_VRME BIT(ec_sensor_temp_vrme)
165+
#define SENSOR_TEMP_VRMW BIT(ec_sensor_temp_vrmw)
160166
#define SENSOR_IN_CPU_CORE BIT(ec_sensor_in_cpu_core)
161167
#define SENSOR_FAN_CPU_OPT BIT(ec_sensor_fan_cpu_opt)
162168
#define SENSOR_FAN_VRM_HS BIT(ec_sensor_fan_vrm_hs)
@@ -296,10 +302,14 @@ static const struct ec_sensor_info sensors_family_amd_800[] = {
296302
};
297303

298304
static const struct ec_sensor_info sensors_family_amd_trx_50[] = {
299-
[ec_sensor_fan_vrmw_hs] =
300-
EC_SENSOR("VRMW HS", hwmon_fan, 2, 0x00, 0xb4),
301-
[ec_sensor_fan_vrme_hs] =
302-
EC_SENSOR("VRME HS", hwmon_fan, 2, 0x00, 0xbc),
305+
[ec_sensor_temp_cpu] = EC_SENSOR("CPU", hwmon_temp, 1, 0x00, 0x30),
306+
[ec_sensor_temp_cpu_package] =
307+
EC_SENSOR("CPU Package", hwmon_temp, 1, 0x00, 0x31),
308+
[ec_sensor_temp_vrme] = EC_SENSOR("VRM_E", hwmon_temp, 1, 0x00, 0x33),
309+
[ec_sensor_temp_vrmw] = EC_SENSOR("VRM_W", hwmon_temp, 1, 0x00, 0x34),
310+
[ec_sensor_fan_cpu_opt] = EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0),
311+
[ec_sensor_fan_vrmw_hs] = EC_SENSOR("VRM_E HS", hwmon_fan, 2, 0x00, 0xb4),
312+
[ec_sensor_fan_vrme_hs] = EC_SENSOR("VRM_W HS", hwmon_fan, 2, 0x00, 0xbc),
303313
[ec_sensor_temp_t_sensor] =
304314
EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x01, 0x04),
305315
};
@@ -545,7 +555,9 @@ static const struct ec_board_info board_info_pro_art_x870E_creator_wifi = {
545555

546556
static const struct ec_board_info board_info_pro_ws_trx50_sage_wifi = {
547557
/* Board also has a nct6798 */
548-
.sensors = SENSOR_TEMP_T_SENSOR | SENSOR_FAN_VRME_HS | SENSOR_FAN_VRMW_HS,
558+
.sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | SENSOR_TEMP_VRME |
559+
SENSOR_TEMP_VRMW | SENSOR_FAN_CPU_OPT | SENSOR_FAN_VRME_HS |
560+
SENSOR_FAN_VRMW_HS | SENSOR_TEMP_T_SENSOR,
549561
.mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
550562
.family = family_amd_trx_50,
551563
};

0 commit comments

Comments
 (0)