diff mbox series

[2/2] hwmon: (asus-ec-sensors) add ROG STRIX Z390-F GAMING

Message ID 20230405224339.358675-3-eugene.shalygin@gmail.com (mailing list archive)
State Accepted
Headers show
Series (asus-ec-sensors) add two more boards | expand

Commit Message

Eugene Shalygin April 5, 2023, 10:43 p.m. UTC
The definition comes from a LHM PR [1], and the mutex path from
the ACPI dump, kindly provided by the PR author [2]

[1] https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/pull/1031
[2] https://github.com/zeule/asus-ec-sensors/issues/36

Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
---
 Documentation/hwmon/asus_ec_sensors.rst |  1 +
 drivers/hwmon/asus-ec-sensors.c         | 10 ++++++++++
 2 files changed, 11 insertions(+)

Comments

Guenter Roeck April 7, 2023, 3:54 p.m. UTC | #1
On Thu, Apr 06, 2023 at 12:43:39AM +0200, Eugene Shalygin wrote:
> The definition comes from a LHM PR [1], and the mutex path from
> the ACPI dump, kindly provided by the PR author [2]
> 
> [1] https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/pull/1031
> [2] https://github.com/zeule/asus-ec-sensors/issues/36
> 
> Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>

Applied.

Thanks,
Guenter

> ---
>  Documentation/hwmon/asus_ec_sensors.rst |  1 +
>  drivers/hwmon/asus-ec-sensors.c         | 10 ++++++++++
>  2 files changed, 11 insertions(+)
> 
> diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst
> index f1c9b1e11268..c92c1d3839e4 100644
> --- a/Documentation/hwmon/asus_ec_sensors.rst
> +++ b/Documentation/hwmon/asus_ec_sensors.rst
> @@ -22,6 +22,7 @@ Supported boards:
>   * ROG STRIX X570-E GAMING WIFI II
>   * ROG STRIX X570-F GAMING
>   * ROG STRIX X570-I GAMING
> + * ROG STRIX Z390-F GAMING
>   * ROG STRIX Z690-A GAMING WIFI D4
>   * ROG ZENITH II EXTREME
>   * ROG ZENITH II EXTREME ALPHA
> diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
> index 594fe7241111..e5be0cf472fc 100644
> --- a/drivers/hwmon/asus-ec-sensors.c
> +++ b/drivers/hwmon/asus-ec-sensors.c
> @@ -408,6 +408,14 @@ static const struct ec_board_info board_info_strix_x570_i_gaming = {
>  	.family = family_amd_500_series,
>  };
>  
> +static const struct ec_board_info board_info_strix_z390_f_gaming = {
> +	.sensors = SENSOR_TEMP_CHIPSET | SENSOR_TEMP_VRM |
> +		SENSOR_TEMP_T_SENSOR |
> +		SENSOR_FAN_CPU_OPT,
> +	.mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
> +	.family = family_intel_300_series,
> +};
> +
>  static const struct ec_board_info board_info_strix_z690_a_gaming_wifi_d4 = {
>  	.sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM,
>  	.mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
> @@ -473,6 +481,8 @@ static const struct dmi_system_id dmi_table[] = {
>  					&board_info_strix_x570_f_gaming),
>  	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX X570-I GAMING",
>  					&board_info_strix_x570_i_gaming),
> +	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX Z390-F GAMING",
> +					&board_info_strix_z390_f_gaming),
>  	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX Z690-A GAMING WIFI D4",
>  					&board_info_strix_z690_a_gaming_wifi_d4),
>  	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG ZENITH II EXTREME",
diff mbox series

Patch

diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst
index f1c9b1e11268..c92c1d3839e4 100644
--- a/Documentation/hwmon/asus_ec_sensors.rst
+++ b/Documentation/hwmon/asus_ec_sensors.rst
@@ -22,6 +22,7 @@  Supported boards:
  * ROG STRIX X570-E GAMING WIFI II
  * ROG STRIX X570-F GAMING
  * ROG STRIX X570-I GAMING
+ * ROG STRIX Z390-F GAMING
  * ROG STRIX Z690-A GAMING WIFI D4
  * ROG ZENITH II EXTREME
  * ROG ZENITH II EXTREME ALPHA
diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
index 594fe7241111..e5be0cf472fc 100644
--- a/drivers/hwmon/asus-ec-sensors.c
+++ b/drivers/hwmon/asus-ec-sensors.c
@@ -408,6 +408,14 @@  static const struct ec_board_info board_info_strix_x570_i_gaming = {
 	.family = family_amd_500_series,
 };
 
+static const struct ec_board_info board_info_strix_z390_f_gaming = {
+	.sensors = SENSOR_TEMP_CHIPSET | SENSOR_TEMP_VRM |
+		SENSOR_TEMP_T_SENSOR |
+		SENSOR_FAN_CPU_OPT,
+	.mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+	.family = family_intel_300_series,
+};
+
 static const struct ec_board_info board_info_strix_z690_a_gaming_wifi_d4 = {
 	.sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM,
 	.mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
@@ -473,6 +481,8 @@  static const struct dmi_system_id dmi_table[] = {
 					&board_info_strix_x570_f_gaming),
 	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX X570-I GAMING",
 					&board_info_strix_x570_i_gaming),
+	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX Z390-F GAMING",
+					&board_info_strix_z390_f_gaming),
 	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX Z690-A GAMING WIFI D4",
 					&board_info_strix_z690_a_gaming_wifi_d4),
 	DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG ZENITH II EXTREME",