Re: [PATCH] hwmon: (asus-ec-sensors) fix Formula VIII definition

From: Guenter Roeck
Date: Tue May 17 2022 - 08:46:48 EST


On Tue, May 17, 2022 at 10:05:08AM +0200, Eugene Shalygin wrote:
> The ROG CROSSHAIR VIII FORMULA board has the same sensors as the
> CROSSHAIR VIII HERO [1] thus let's join their definitions which adds
> missing sensors for Formula.
>
> [1] https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/pull/740
>
> Signed-off-by: Eugene Shalygin <eugene.shalygin@xxxxxxxxx>

Applied.

Thanks,
Guenter

> ---
> drivers/hwmon/asus-ec-sensors.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
> index 611e897429b1..57e11b2bab74 100644
> --- a/drivers/hwmon/asus-ec-sensors.c
> +++ b/drivers/hwmon/asus-ec-sensors.c
> @@ -54,7 +54,7 @@ static char *mutex_path_override;
> /* ACPI mutex for locking access to the EC for the firmware */
> #define ASUS_HW_ACCESS_MUTEX_ASMX "\\AMW0.ASMX"
>
> -#define MAX_IDENTICAL_BOARD_VARIATIONS 2
> +#define MAX_IDENTICAL_BOARD_VARIATIONS 3
>
> /* Moniker for the ACPI global lock (':' is not allowed in ASL identifiers) */
> #define ACPI_GLOBAL_LOCK_PSEUDO_PATH ":GLOBAL_LOCK"
> @@ -257,17 +257,9 @@ static const struct ec_board_info board_info[] = {
> .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
> .family = family_amd_500_series,
> },
> - {
> - .board_names = {"ROG CROSSHAIR VIII FORMULA"},
> - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> - SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
> - SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET |
> - SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE,
> - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
> - .family = family_amd_500_series,
> - },
> {
> .board_names = {
> + "ROG CROSSHAIR VIII FORMULA"
> "ROG CROSSHAIR VIII HERO",
> "ROG CROSSHAIR VIII HERO (WI-FI)",
> },