* [PATCH] hwmon: (asus-ec-sensors) add support for Maximus XI Hero
@ 2022-06-27 22:54 Eugene Shalygin
2022-06-29 21:06 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Eugene Shalygin @ 2022-06-27 22:54 UTC (permalink / raw)
To: eugene.shalygin
Cc: Michael Carns, Jean Delvare, Guenter Roeck, Jonathan Corbet,
linux-hwmon, linux-doc, linux-kernel
From: Michael Carns <mike@carns.com>
Add definitions for ROG MAXIMUS XI HERO and ROG MAXIMUS XI HERO (WI-FI)
boards.
Signed-off-by: Michael Carns <mike@carns.com>
Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
---
Documentation/hwmon/asus_ec_sensors.rst | 2 ++
drivers/hwmon/asus-ec-sensors.c | 36 +++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst
index 00d8c46ef9e0..1e40c123db77 100644
--- a/Documentation/hwmon/asus_ec_sensors.rst
+++ b/Documentation/hwmon/asus_ec_sensors.rst
@@ -13,6 +13,8 @@ Supported boards:
* ROG CROSSHAIR VIII FORMULA
* ROG CROSSHAIR VIII HERO
* ROG CROSSHAIR VIII IMPACT
+ * ROG MAXIMUS XI HERO
+ * ROG MAXIMUS XI HERO (WI-FI)
* ROG STRIX B550-E GAMING
* ROG STRIX B550-I GAMING
* ROG STRIX X570-E GAMING
diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
index 19d3ca71b360..625c2baa35ec 100644
--- a/drivers/hwmon/asus-ec-sensors.c
+++ b/drivers/hwmon/asus-ec-sensors.c
@@ -141,6 +141,7 @@ enum board_family {
family_unknown,
family_amd_400_series,
family_amd_500_series,
+ family_intel_300_series,
family_intel_600_series
};
@@ -200,6 +201,26 @@ static const struct ec_sensor_info sensors_family_amd_500[] = {
EC_SENSOR("Water_Out", hwmon_temp, 1, 0x01, 0x01),
};
+static const struct ec_sensor_info sensors_family_intel_300[] = {
+ [ec_sensor_temp_chipset] =
+ EC_SENSOR("Chipset", hwmon_temp, 1, 0x00, 0x3a),
+ [ec_sensor_temp_cpu] = EC_SENSOR("CPU", hwmon_temp, 1, 0x00, 0x3b),
+ [ec_sensor_temp_mb] =
+ EC_SENSOR("Motherboard", hwmon_temp, 1, 0x00, 0x3c),
+ [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_cpu_opt] =
+ EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0),
+ [ec_sensor_fan_vrm_hs] = EC_SENSOR("VRM HS", hwmon_fan, 2, 0x00, 0xb2),
+ [ec_sensor_fan_water_flow] =
+ EC_SENSOR("Water_Flow", hwmon_fan, 2, 0x00, 0xbc),
+ [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),
+};
+
static const struct ec_sensor_info sensors_family_intel_600[] = {
[ec_sensor_temp_t_sensor] =
EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x00, 0x3d),
@@ -281,6 +302,18 @@ static const struct ec_board_info board_info[] = {
.mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
.family = family_amd_500_series,
},
+ {
+ .board_names = {
+ "ROG MAXIMUS XI HERO",
+ "ROG MAXIMUS XI HERO (WI-FI)",
+ },
+ .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+ SENSOR_TEMP_T_SENSOR |
+ SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
+ SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW,
+ .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+ .family = family_intel_300_series,
+ },
{
.board_names = {"ROG CROSSHAIR VIII IMPACT"},
.sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
@@ -814,6 +847,9 @@ static int __init asus_ec_probe(struct platform_device *pdev)
case family_amd_500_series:
ec_data->sensors_info = sensors_family_amd_500;
break;
+ case family_intel_300_series:
+ ec_data->sensors_info = sensors_family_intel_300;
+ break;
case family_intel_600_series:
ec_data->sensors_info = sensors_family_intel_600;
break;
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] hwmon: (asus-ec-sensors) add support for Maximus XI Hero
2022-06-27 22:54 [PATCH] hwmon: (asus-ec-sensors) add support for Maximus XI Hero Eugene Shalygin
@ 2022-06-29 21:06 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2022-06-29 21:06 UTC (permalink / raw)
To: Eugene Shalygin
Cc: Michael Carns, Jean Delvare, Jonathan Corbet, linux-hwmon,
linux-doc, linux-kernel
On Tue, Jun 28, 2022 at 12:54:36AM +0200, Eugene Shalygin wrote:
> From: Michael Carns <mike@carns.com>
>
> Add definitions for ROG MAXIMUS XI HERO and ROG MAXIMUS XI HERO (WI-FI)
> boards.
>
> Signed-off-by: Michael Carns <mike@carns.com>
> Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Documentation/hwmon/asus_ec_sensors.rst | 2 ++
> drivers/hwmon/asus-ec-sensors.c | 36 +++++++++++++++++++++++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst
> index 00d8c46ef9e0..1e40c123db77 100644
> --- a/Documentation/hwmon/asus_ec_sensors.rst
> +++ b/Documentation/hwmon/asus_ec_sensors.rst
> @@ -13,6 +13,8 @@ Supported boards:
> * ROG CROSSHAIR VIII FORMULA
> * ROG CROSSHAIR VIII HERO
> * ROG CROSSHAIR VIII IMPACT
> + * ROG MAXIMUS XI HERO
> + * ROG MAXIMUS XI HERO (WI-FI)
> * ROG STRIX B550-E GAMING
> * ROG STRIX B550-I GAMING
> * ROG STRIX X570-E GAMING
> diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
> index 19d3ca71b360..625c2baa35ec 100644
> --- a/drivers/hwmon/asus-ec-sensors.c
> +++ b/drivers/hwmon/asus-ec-sensors.c
> @@ -141,6 +141,7 @@ enum board_family {
> family_unknown,
> family_amd_400_series,
> family_amd_500_series,
> + family_intel_300_series,
> family_intel_600_series
> };
>
> @@ -200,6 +201,26 @@ static const struct ec_sensor_info sensors_family_amd_500[] = {
> EC_SENSOR("Water_Out", hwmon_temp, 1, 0x01, 0x01),
> };
>
> +static const struct ec_sensor_info sensors_family_intel_300[] = {
> + [ec_sensor_temp_chipset] =
> + EC_SENSOR("Chipset", hwmon_temp, 1, 0x00, 0x3a),
> + [ec_sensor_temp_cpu] = EC_SENSOR("CPU", hwmon_temp, 1, 0x00, 0x3b),
> + [ec_sensor_temp_mb] =
> + EC_SENSOR("Motherboard", hwmon_temp, 1, 0x00, 0x3c),
> + [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_cpu_opt] =
> + EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0),
> + [ec_sensor_fan_vrm_hs] = EC_SENSOR("VRM HS", hwmon_fan, 2, 0x00, 0xb2),
> + [ec_sensor_fan_water_flow] =
> + EC_SENSOR("Water_Flow", hwmon_fan, 2, 0x00, 0xbc),
> + [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),
> +};
> +
> static const struct ec_sensor_info sensors_family_intel_600[] = {
> [ec_sensor_temp_t_sensor] =
> EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x00, 0x3d),
> @@ -281,6 +302,18 @@ static const struct ec_board_info board_info[] = {
> .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
> .family = family_amd_500_series,
> },
> + {
> + .board_names = {
> + "ROG MAXIMUS XI HERO",
> + "ROG MAXIMUS XI HERO (WI-FI)",
> + },
> + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> + SENSOR_TEMP_T_SENSOR |
> + SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
> + SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW,
> + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
> + .family = family_intel_300_series,
> + },
> {
> .board_names = {"ROG CROSSHAIR VIII IMPACT"},
> .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> @@ -814,6 +847,9 @@ static int __init asus_ec_probe(struct platform_device *pdev)
> case family_amd_500_series:
> ec_data->sensors_info = sensors_family_amd_500;
> break;
> + case family_intel_300_series:
> + ec_data->sensors_info = sensors_family_intel_300;
> + break;
> case family_intel_600_series:
> ec_data->sensors_info = sensors_family_intel_600;
> break;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-29 21:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-27 22:54 [PATCH] hwmon: (asus-ec-sensors) add support for Maximus XI Hero Eugene Shalygin
2022-06-29 21:06 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox