Message ID | 20241130133837.24454-2-yanhuoguifan@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | hwmon: (asus-ec-sensors) add TUF GAMING X670E PLUS | expand |
Hi, Thank you for the patch! One little request, please, is to keep the definitions list sorted, that is, could you, please, put the new board definition in the source file after ROG CROSSHAIR X670E GENE? Otherwise LGTM. Kind regards, Eugene On Sat, 30 Nov 2024 at 14:38, Li XingYang <yanhuoguifan@gmail.com> wrote: > > add asus-ec-sensors on the mainboard TUF GAMING X670E PLUS > support these sensors: > SENSOR_TEMP_CPU, SENSOR_TEMP_CPU_PACKAGE, SENSOR_TEMP_MB > SENSOR_TEMP_VRM, SENSOR_TEMP_WATER_IN, SENSOR_TEMP_WATER_OUT > and SENSOR_FAN_CPU_OPT > > Signed-off-by: Li XingYang <yanhuoguifan@gmail.com> > --- > Documentation/hwmon/asus_ec_sensors.rst | 1 + > drivers/hwmon/asus-ec-sensors.c | 13 +++++++++++++ > 2 files changed, 14 insertions(+) > > diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst > index ca38922f4ec5..d049a62719b0 100644 > --- a/Documentation/hwmon/asus_ec_sensors.rst > +++ b/Documentation/hwmon/asus_ec_sensors.rst > @@ -17,6 +17,7 @@ Supported boards: > * ROG CROSSHAIR VIII IMPACT > * ROG CROSSHAIR X670E HERO > * ROG CROSSHAIR X670E GENE > + * TUF GAMING X670E PLUS > * ROG MAXIMUS XI HERO > * ROG MAXIMUS XI HERO (WI-FI) > * ROG STRIX B550-E GAMING > diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c > index 9555366aeaf0..d9b4074080bd 100644 > --- a/drivers/hwmon/asus-ec-sensors.c > +++ b/drivers/hwmon/asus-ec-sensors.c > @@ -250,6 +250,8 @@ static const struct ec_sensor_info sensors_family_amd_600[] = { > 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_fan_cpu_opt] = > + EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0), > }; > > static const struct ec_sensor_info sensors_family_intel_300[] = { > @@ -354,6 +356,15 @@ static const struct ec_board_info board_info_crosshair_x670e_hero = { > .family = family_amd_600_series, > }; > > +static const struct ec_board_info board_info_tuf_gaming_x670e_plus = { > + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | > + SENSOR_TEMP_MB | SENSOR_TEMP_VRM | > + SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT | > + SENSOR_FAN_CPU_OPT, > + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, > + .family = family_amd_600_series, > +}; > + > static const struct ec_board_info board_info_crosshair_x670e_gene = { > .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | > SENSOR_TEMP_T_SENSOR | > @@ -512,6 +523,8 @@ static const struct dmi_system_id dmi_table[] = { > &board_info_crosshair_x670e_hero), > DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E GENE", > &board_info_crosshair_x670e_gene), > + DMI_EXACT_MATCH_ASUS_BOARD_NAME("TUF GAMING X670E-PLUS", > + &board_info_tuf_gaming_x670e_plus), > DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO", > &board_info_maximus_xi_hero), > DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO (WI-FI)", > -- > 2.47.1 >
diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst index ca38922f4ec5..d049a62719b0 100644 --- a/Documentation/hwmon/asus_ec_sensors.rst +++ b/Documentation/hwmon/asus_ec_sensors.rst @@ -17,6 +17,7 @@ Supported boards: * ROG CROSSHAIR VIII IMPACT * ROG CROSSHAIR X670E HERO * ROG CROSSHAIR X670E GENE + * TUF GAMING X670E PLUS * ROG MAXIMUS XI HERO * ROG MAXIMUS XI HERO (WI-FI) * ROG STRIX B550-E GAMING diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c index 9555366aeaf0..d9b4074080bd 100644 --- a/drivers/hwmon/asus-ec-sensors.c +++ b/drivers/hwmon/asus-ec-sensors.c @@ -250,6 +250,8 @@ static const struct ec_sensor_info sensors_family_amd_600[] = { 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_fan_cpu_opt] = + EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0), }; static const struct ec_sensor_info sensors_family_intel_300[] = { @@ -354,6 +356,15 @@ static const struct ec_board_info board_info_crosshair_x670e_hero = { .family = family_amd_600_series, }; +static const struct ec_board_info board_info_tuf_gaming_x670e_plus = { + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | + SENSOR_TEMP_MB | SENSOR_TEMP_VRM | + SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT | + SENSOR_FAN_CPU_OPT, + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, + .family = family_amd_600_series, +}; + static const struct ec_board_info board_info_crosshair_x670e_gene = { .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | SENSOR_TEMP_T_SENSOR | @@ -512,6 +523,8 @@ static const struct dmi_system_id dmi_table[] = { &board_info_crosshair_x670e_hero), DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E GENE", &board_info_crosshair_x670e_gene), + DMI_EXACT_MATCH_ASUS_BOARD_NAME("TUF GAMING X670E-PLUS", + &board_info_tuf_gaming_x670e_plus), DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO", &board_info_maximus_xi_hero), DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO (WI-FI)",
add asus-ec-sensors on the mainboard TUF GAMING X670E PLUS support these sensors: SENSOR_TEMP_CPU, SENSOR_TEMP_CPU_PACKAGE, SENSOR_TEMP_MB SENSOR_TEMP_VRM, SENSOR_TEMP_WATER_IN, SENSOR_TEMP_WATER_OUT and SENSOR_FAN_CPU_OPT Signed-off-by: Li XingYang <yanhuoguifan@gmail.com> --- Documentation/hwmon/asus_ec_sensors.rst | 1 + drivers/hwmon/asus-ec-sensors.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)