From ca9616b9840242a1811e9ab858e412b5c2ef2ceb Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Tue, 1 Apr 2025 10:51:16 -0600 Subject: [PATCH] ec/system76/ec: Add config for 2nd fan without GPU The darp10 has a second fan but no dGPU. The NFAN Method must exist, so use the default hwmon names of "fan1" and "fan2" for labels. Change-Id: I553deefea374b9dd916be6611850fca61afd490d Signed-off-by: Tim Crawford Reviewed-on: https://review.coreboot.org/c/coreboot/+/87068 Tested-by: build bot (Jenkins) Reviewed-by: Jeremy Soller --- src/ec/system76/ec/Kconfig | 12 +++++++++--- src/ec/system76/ec/acpi/s76.asl | 7 ++++++- src/mainboard/system76/mtl/Kconfig | 2 ++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/ec/system76/ec/Kconfig b/src/ec/system76/ec/Kconfig index 4b7191241b..f0702a76d1 100644 --- a/src/ec/system76/ec/Kconfig +++ b/src/ec/system76/ec/Kconfig @@ -6,16 +6,22 @@ config EC_SYSTEM76_EC System76 EC config EC_SYSTEM76_EC_BAT_THRESHOLDS - depends on EC_SYSTEM76_EC bool default y + depends on EC_SYSTEM76_EC + +config EC_SYSTEM76_EC_FAN2 + bool + default n + depends on EC_SYSTEM76_EC config EC_SYSTEM76_EC_DGPU - depends on EC_SYSTEM76_EC bool default n + select EC_SYSTEM76_EC_FAN2 + depends on EC_SYSTEM76_EC config EC_SYSTEM76_EC_OLED - depends on EC_SYSTEM76_EC bool default n + depends on EC_SYSTEM76_EC diff --git a/src/ec/system76/ec/acpi/s76.asl b/src/ec/system76/ec/acpi/s76.asl index 06000a4077..f3e2deccdf 100644 --- a/src/ec/system76/ec/acpi/s76.asl +++ b/src/ec/system76/ec/acpi/s76.asl @@ -126,9 +126,14 @@ Device (S76D) { // Fan names Method (NFAN, 0, Serialized) { Return (Package() { - "CPU fan", #if CONFIG(EC_SYSTEM76_EC_DGPU) + "CPU fan", "GPU fan", +#elif CONFIG(EC_SYSTEM76_EC_FAN2) + "fan1", + "fan2", +#else + "CPU fan", #endif }) } diff --git a/src/mainboard/system76/mtl/Kconfig b/src/mainboard/system76/mtl/Kconfig index 60eba4aaa6..81558aa34c 100644 --- a/src/mainboard/system76/mtl/Kconfig +++ b/src/mainboard/system76/mtl/Kconfig @@ -26,12 +26,14 @@ config BOARD_SYSTEM76_MTL_COMMON config BOARD_SYSTEM76_DARP10 select BOARD_SYSTEM76_MTL_COMMON + select EC_SYSTEM76_EC_FAN2 select MAINBOARD_USES_IFD_GBE_REGION select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_METEORLAKE_U_H config BOARD_SYSTEM76_DARP10_B select BOARD_SYSTEM76_MTL_COMMON + select EC_SYSTEM76_EC_FAN2 select MAINBOARD_USES_IFD_GBE_REGION select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_METEORLAKE_U_H