On Sat, Jun 07, 2025 at 12:26:14PM +0200, Eugene Shalygin wrote:
> Adds support for the ProArt X870E-CREATOR WIFI board.
>
> Signed-off-by: Eugene Shalygin <eugene.shalygin@xxxxxxxxx>
I get:
Applying: hwmon: (asus-ec-sensors) add ProArt X870E-CREATOR WIFI
error: sha1 information is lacking or useless (Documentation/hwmon/asus_ec_sensors.rst).
error: could not build fake ancestor
Patch failed at 0001 hwmon: (asus-ec-sensors) add ProArt X870E-CREATOR WIFI
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
failed to apply
Fix problem, then apply manually
What is the baseline for this patch ?
Guenter
> ---
> Documentation/hwmon/asus_ec_sensors.rst | 1 +
> drivers/hwmon/asus-ec-sensors.c | 28 +++++++++++++++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/Documentation/hwmon/asus_ec_sensors.rst b/Documentation/hwmon/asus_ec_sensors.rst
> index 502b0faf3b31..de2f2985f06f 100644
> --- a/Documentation/hwmon/asus_ec_sensors.rst
> +++ b/Documentation/hwmon/asus_ec_sensors.rst
> @@ -11,6 +11,7 @@ Supported boards:
> * Pro WS X570-ACE
> * ProArt X570-CREATOR WIFI
> * ProArt X670E-CREATOR WIFI
> + * ProArt X870E-CREATOR WIFI
> * ProArt B550-CREATOR
> * ROG CROSSHAIR VIII DARK HERO
> * ROG CROSSHAIR VIII HERO (WI-FI)
> diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
> index c3d5bcbd63f8..4ac554731e98 100644
> --- a/drivers/hwmon/asus-ec-sensors.c
> +++ b/drivers/hwmon/asus-ec-sensors.c
> @@ -165,6 +165,7 @@ enum board_family {
> family_amd_400_series,
> family_amd_500_series,
> family_amd_600_series,
> + family_amd_800_series,
> family_intel_300_series,
> family_intel_400_series,
> family_intel_600_series
> @@ -260,6 +261,20 @@ static const struct ec_sensor_info sensors_family_amd_600[] = {
> EC_SENSOR("Water_Out", hwmon_temp, 1, 0x01, 0x01),
> };
>
> +static const struct ec_sensor_info sensors_family_amd_800[] = {
> + [ec_sensor_temp_cpu] = EC_SENSOR("CPU", hwmon_temp, 1, 0x00, 0x30),
> + [ec_sensor_temp_cpu_package] =
> + EC_SENSOR("CPU Package", hwmon_temp, 1, 0x00, 0x31),
> + [ec_sensor_temp_mb] =
> + EC_SENSOR("Motherboard", hwmon_temp, 1, 0x00, 0x32),
> + [ec_sensor_temp_vrm] =
> + EC_SENSOR("VRM", hwmon_temp, 1, 0x00, 0x33),
> + [ec_sensor_temp_t_sensor] =
> + EC_SENSOR("T_Sensor", hwmon_temp, 1, 0x00, 0x36),
> + [ec_sensor_fan_cpu_opt] =
> + EC_SENSOR("CPU_Opt", hwmon_fan, 2, 0x00, 0xb0),
> +};
> +
> static const struct ec_sensor_info sensors_family_intel_300[] = {
> [ec_sensor_temp_chipset] =
> EC_SENSOR("Chipset", hwmon_temp, 1, 0x00, 0x3a),
> @@ -377,6 +392,14 @@ static const struct ec_board_info board_info_pro_art_x670E_creator_wifi = {
> .family = family_amd_600_series,
> };
>
> +static const struct ec_board_info board_info_pro_art_x870E_creator_wifi = {
> + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
> + SENSOR_TEMP_MB | SENSOR_TEMP_VRM |
> + SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CPU_OPT,
> + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
> + .family = family_amd_800_series,
> +};
> +
> static const struct ec_board_info board_info_pro_art_b550_creator = {
> .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
> SENSOR_TEMP_T_SENSOR |
> @@ -575,6 +598,8 @@ static const struct dmi_system_id dmi_table[] = {
> &board_info_pro_art_x570_creator_wifi),
> DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X670E-CREATOR WIFI",
> &board_info_pro_art_x670E_creator_wifi),
> + DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X870E-CREATOR WIFI",
> + &board_info_pro_art_x870E_creator_wifi),
> DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt B550-CREATOR",
> &board_info_pro_art_b550_creator),
> DMI_EXACT_MATCH_ASUS_BOARD_NAME("Pro WS X570-ACE",
> @@ -1087,6 +1112,9 @@ static int asus_ec_probe(struct platform_device *pdev)
> case family_amd_600_series:
> ec_data->sensors_info = sensors_family_amd_600;
> break;
> + case family_amd_800_series:
> + ec_data->sensors_info = sensors_family_amd_800;
> + break;
> case family_intel_300_series:
> ec_data->sensors_info = sensors_family_intel_300;
> break;
