From e43c3f090d3716951b824530aba48e516b3eeca4 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Wed, 1 May 2024 17:28:56 -0600 Subject: [PATCH 1/2] ec/system76/ec: Remove RPM calculation This calculation depends on the EC configuration. The EC is now responsible for the calculation, and the RAM values have the actual RPM values. Change-Id: Ifabbcb5922643e218ed7c4984b1d41aee841bb39 Signed-off-by: Tim Crawford --- src/ec/system76/ec/acpi/s76.asl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ec/system76/ec/acpi/s76.asl b/src/ec/system76/ec/acpi/s76.asl index 329c5d3246..06000a4077 100644 --- a/src/ec/system76/ec/acpi/s76.asl +++ b/src/ec/system76/ec/acpi/s76.asl @@ -146,10 +146,6 @@ Device (S76D) { Local1 = ^^PCI0.LPCB.EC0.RPM2 } } - If (Local1 != 0) { - // 60 * (EC frequency / 120) / 2 - Local1 = 2156250 / Local1 - } Return ((Local1 << 8) | Local0) } From 7e97d2d7f538e466ce4b719addb354fe911c05cb Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Fri, 5 Jul 2024 16:02:41 -0600 Subject: [PATCH 2/2] ec/system76/ec: Add config for 2nd fan without dGPU 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: Icde5dec82262d9262b046c1557167801af8e5cb2 Signed-off-by: Tim Crawford --- src/ec/system76/ec/Kconfig | 14 ++++++++++---- src/ec/system76/ec/acpi/s76.asl | 7 ++++++- src/mainboard/system76/mtl/Kconfig | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/ec/system76/ec/Kconfig b/src/ec/system76/ec/Kconfig index 213b6f20a1..14899dbce7 100644 --- a/src/ec/system76/ec/Kconfig +++ b/src/ec/system76/ec/Kconfig @@ -6,21 +6,27 @@ 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_DGPU +config EC_SYSTEM76_EC_FAN2 + bool + default n depends on EC_SYSTEM76_EC + +config EC_SYSTEM76_EC_DGPU bool default n + select EC_SYSTEM76_EC_FAN2 + depends on EC_SYSTEM76_EC config EC_SYSTEM76_EC_LOCKDOWN - depends on EC_SYSTEM76_EC bool default n + 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 5422730488..a0515d905c 100644 --- a/src/mainboard/system76/mtl/Kconfig +++ b/src/mainboard/system76/mtl/Kconfig @@ -28,12 +28,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