Skip to content

Commit bb712a7

Browse files
committed
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 <tcrawford@system76.com>
1 parent 9f82a09 commit bb712a7

3 files changed

Lines changed: 18 additions & 5 deletions

File tree

src/ec/system76/ec/Kconfig

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,27 @@ config EC_SYSTEM76_EC
66
System76 EC
77

88
config EC_SYSTEM76_EC_BAT_THRESHOLDS
9-
depends on EC_SYSTEM76_EC
109
bool
1110
default y
11+
depends on EC_SYSTEM76_EC
1212

13-
config EC_SYSTEM76_EC_DGPU
13+
config EC_SYSTEM76_EC_FAN2
14+
bool
15+
default n
1416
depends on EC_SYSTEM76_EC
17+
18+
config EC_SYSTEM76_EC_DGPU
1519
bool
1620
default n
21+
select EC_SYSTEM76_EC_FAN2
22+
depends on EC_SYSTEM76_EC
1723

1824
config EC_SYSTEM76_EC_LOCKDOWN
19-
depends on EC_SYSTEM76_EC
2025
bool
2126
default n
27+
depends on EC_SYSTEM76_EC
2228

2329
config EC_SYSTEM76_EC_OLED
24-
depends on EC_SYSTEM76_EC
2530
bool
2631
default n
32+
depends on EC_SYSTEM76_EC

src/ec/system76/ec/acpi/s76.asl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,14 @@ Device (S76D) {
126126
// Fan names
127127
Method (NFAN, 0, Serialized) {
128128
Return (Package() {
129-
"CPU fan",
130129
#if CONFIG(EC_SYSTEM76_EC_DGPU)
130+
"CPU fan",
131131
"GPU fan",
132+
#elif CONFIG(EC_SYSTEM76_EC_FAN2)
133+
"fan1",
134+
"fan2",
135+
#else
136+
"CPU fan",
132137
#endif
133138
})
134139
}

src/mainboard/system76/mtl/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ config BOARD_SYSTEM76_MTL_COMMON
2828

2929
config BOARD_SYSTEM76_DARP10
3030
select BOARD_SYSTEM76_MTL_COMMON
31+
select EC_SYSTEM76_EC_FAN2
3132
select MAINBOARD_USES_IFD_GBE_REGION
3233
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
3334
select SOC_INTEL_METEORLAKE_U_H
3435

3536
config BOARD_SYSTEM76_DARP10_B
3637
select BOARD_SYSTEM76_MTL_COMMON
38+
select EC_SYSTEM76_EC_FAN2
3739
select MAINBOARD_USES_IFD_GBE_REGION
3840
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
3941
select SOC_INTEL_METEORLAKE_U_H

0 commit comments

Comments
 (0)