diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk
index d735f7f..f8765bd 100644
--- a/src/board/system76/addw1/board.mk
+++ b/src/board/system76/addw1/board.mk
@@ -34,6 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
@@ -46,6 +47,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index 69fe5e3..e87a60a 100644
--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -34,6 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
@@ -46,6 +47,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
diff --git a/src/board/system76/addw3/board.mk b/src/board/system76/addw3/board.mk
index 5231001..752ac35 100644
--- a/src/board/system76/addw3/board.mk
+++ b/src/board/system76/addw3/board.mk
@@ -43,6 +43,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -57,6 +58,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/addw4/board.mk b/src/board/system76/addw4/board.mk
index 310be1e..e757f22 100644
--- a/src/board/system76/addw4/board.mk
+++ b/src/board/system76/addw4/board.mk
@@ -39,6 +39,7 @@ CFLAGS += \
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -55,6 +56,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index d3099ea..32565c6 100644
--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -34,6 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
@@ -46,6 +47,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
diff --git a/src/board/system76/bonw15/board.mk b/src/board/system76/bonw15/board.mk
index 7fc4229..fcdd7bc 100644
--- a/src/board/system76/bonw15/board.mk
+++ b/src/board/system76/bonw15/board.mk
@@ -48,9 +48,10 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
-CFLAGS += -DBOARD_FAN2_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
@@ -62,6 +63,7 @@ CFLAGS += -DBOARD_FAN2_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/common/acpi.c b/src/board/system76/common/acpi.c
index 5b151b6..8deb7af 100644
--- a/src/board/system76/common/acpi.c
+++ b/src/board/system76/common/acpi.c
@@ -161,13 +161,15 @@ uint8_t acpi_read(uint8_t addr) {
 
         ACPI_8(0xCC, sci_extra);
 
-        ACPI_8(0xCE, DCR2);
+        ACPI_8(0xCE, FAN1_PWM);
         ACPI_16(0xD0, pwm_tach0_rpm);
 #if CONFIG_HAVE_DGPU
         ACPI_8(0xCD, dgpu_temp);
-        ACPI_8(0xCF, DCR4);
-        ACPI_16(0xD2, pwm_tach1_rpm);
 #endif // CONFIG_HAVE_DGPU
+#ifdef FAN2_PWM
+        ACPI_8(0xCF, FAN2_PWM);
+        ACPI_16(0xD2, pwm_tach1_rpm);
+#endif // FAN2_PWM
 
 #if HAVE_LED_AIRPLANE_N
         // Airplane mode LED
diff --git a/src/board/system76/common/fan.c b/src/board/system76/common/fan.c
index 9fdbaf6..a94b79c 100644
--- a/src/board/system76/common/fan.c
+++ b/src/board/system76/common/fan.c
@@ -251,35 +251,32 @@ static uint8_t get_fan2_duty(void) {
 }
 #endif // CONFIG_HAVE_DGPU
 
-static void fan_duty_set(uint8_t fan1_duty, uint8_t fan2_duty) __reentrant {
+void fan_update_duty(void) {
+    uint8_t fan1_duty = get_fan1_duty();
+#ifdef FAN2_PWM
+    uint8_t fan2_duty = get_fan2_duty();
+
 #if SYNC_FANS != 0
-    fan1_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty;
-    fan2_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty;
-#endif
+    fan1_duty = MAX(fan1_duty, fan2_duty);
+    fan2_duty = MAX(fan1_duty, fan2_duty);
+#endif // SYNC_FANS
+#endif // FAN2_PWM
 
     // set FAN1 duty
-    if (fan1_duty != DCR2) {
+    if (fan1_duty != FAN1_PWM) {
         TRACE("FAN1 fan_duty_raw=%d\n", fan1_duty);
         last_fan1_duty = fan1_duty = fan_smooth(last_fan1_duty, fan1_duty);
-        DCR2 = fan_max ? MAX_FAN_SPEED : fan1_duty;
-#if HAVE_CPU_FAN2
-        // FIXME: Handle better
-        DCR3 = fan_max ? MAX_FAN_SPEED : fan1_duty;
-#endif
+        FAN1_PWM = fan_max ? MAX_FAN_SPEED : fan1_duty;
         TRACE("FAN1 fan_duty_smoothed=%d\n", fan1_duty);
     }
 
+#ifdef FAN2_PWM
     // set FAN2 duty
-    if (fan2_duty != DCR4) {
+    if (fan2_duty != FAN2_PWM) {
         TRACE("FAN2 fan_duty_raw=%d\n", fan2_duty);
         last_fan2_duty = fan2_duty = fan_smooth(last_fan2_duty, fan2_duty);
-        DCR4 = fan_max ? MAX_FAN_SPEED : fan2_duty;
+        FAN2_PWM = fan_max ? MAX_FAN_SPEED : fan2_duty;
         TRACE("FAN2 fan_duty_smoothed=%d\n", fan2_duty);
     }
-}
-
-void fan_update_duty(void) {
-    uint8_t fan1_duty = get_fan1_duty();
-    uint8_t fan2_duty = get_fan2_duty();
-    fan_duty_set(fan1_duty, fan2_duty);
+#endif
 }
diff --git a/src/board/system76/common/pwm.c b/src/board/system76/common/pwm.c
index 2c49660..e972aaa 100644
--- a/src/board/system76/common/pwm.c
+++ b/src/board/system76/common/pwm.c
@@ -36,12 +36,9 @@ void pwm_init(void) {
     CTR0 = 255;
 
     // Turn off fans
-    DCR2 = 0;
-#if HAVE_CPU_FAN2
-    DCR3 = 0;
-#endif
-#if CONFIG_HAVE_DGPU
-    DCR4 = 0;
+    FAN1_PWM = 0;
+#ifdef FAN2_PWM
+    FAN2_PWM = 0;
 #endif
 
 #if CONFIG_EC_ITE_IT5570E || CONFIG_EC_ITE_IT5571E
diff --git a/src/board/system76/common/scratch.c b/src/board/system76/common/scratch.c
index 118f958..6ea515f 100644
--- a/src/board/system76/common/scratch.c
+++ b/src/board/system76/common/scratch.c
@@ -17,12 +17,9 @@ uint8_t __code __at(SCRATCH_OFFSET) scratch_rom[] = {
 // Enter or exit scratch ROM
 void scratch_trampoline(void) {
     // Set fans to 100%
-    DCR2 = 0xFF;
-#if HAVE_CPU_FAN2
-    DCR3 = 0xFF;
-#endif
-#if CONFIG_HAVE_DGPU
-    DCR4 = 0xFF;
+    FAN1_PWM = 0xFF;
+#ifdef FAN2_PWM
+    FAN2_PWM = 0xFF;
 #endif
 
     //TODO: Clear keyboard presses
diff --git a/src/board/system76/common/smfi.c b/src/board/system76/common/smfi.c
index e6c1872..f33166f 100644
--- a/src/board/system76/common/smfi.c
+++ b/src/board/system76/common/smfi.c
@@ -123,15 +123,16 @@ static enum Result cmd_print(void) {
 
 static enum Result cmd_fan_get(void) {
     switch (smfi_cmd[SMFI_CMD_DATA]) {
-    case 0:
-        // Get duty of fan 0
-        smfi_cmd[SMFI_CMD_DATA + 1] = DCR2;
-        return RES_OK;
     case 1:
-        // Get duty of fan 1
-        //TODO: only allow on platforms like addw2
-        smfi_cmd[SMFI_CMD_DATA + 1] = DCR4;
+        // Get duty of FAN1
+        smfi_cmd[SMFI_CMD_DATA + 1] = FAN1_PWM;
         return RES_OK;
+#ifdef FAN2_PWM
+    case 2:
+        // Get duty of FAN2
+        smfi_cmd[SMFI_CMD_DATA + 1] = FAN2_PWM;
+        return RES_OK;
+#endif
     }
 
     // Failed if fan not found
@@ -140,15 +141,16 @@ static enum Result cmd_fan_get(void) {
 
 static enum Result cmd_fan_set(void) {
     switch (smfi_cmd[SMFI_CMD_DATA]) {
-    case 0:
-        // Set duty cycle of fan 0
-        DCR2 = smfi_cmd[SMFI_CMD_DATA + 1];
-        return RES_OK;
     case 1:
-        // Set duty cycle of fan 1
-        //TODO: only allow on platforms like addw2
-        DCR4 = smfi_cmd[SMFI_CMD_DATA + 1];
+        // Set duty cycle of FAN1
+        FAN1_PWM = smfi_cmd[SMFI_CMD_DATA + 1];
         return RES_OK;
+#ifdef FAN2_PWM
+    case 2:
+        // Set duty cycle of FAN2
+        FAN2_PWM = smfi_cmd[SMFI_CMD_DATA + 1];
+        return RES_OK;
+#endif
     }
 
     // Failed if fan not found
diff --git a/src/board/system76/darp10-b/board.mk b/src/board/system76/darp10-b/board.mk
index 5b970fb..1ef9069 100644
--- a/src/board/system76/darp10-b/board.mk
+++ b/src/board/system76/darp10-b/board.mk
@@ -41,7 +41,8 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
-CFLAGS += -DHAVE_CPU_FAN2=1
+CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DFAN2_PWM=DCR3
 
 # Add common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp10/board.mk b/src/board/system76/darp10/board.mk
index f9cf24c..0e91c63 100644
--- a/src/board/system76/darp10/board.mk
+++ b/src/board/system76/darp10/board.mk
@@ -39,7 +39,8 @@ CFLAGS += \
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
-CFLAGS += -DHAVE_CPU_FAN2=1
+CFLAGS += -DFAN1_PWM=DCR2
+CFLAGS += -DFAN2_PWM=DCR3
 
 # Add common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp5/board.mk b/src/board/system76/darp5/board.mk
index c40d600..47a4881 100644
--- a/src/board/system76/darp5/board.mk
+++ b/src/board/system76/darp5/board.mk
@@ -34,5 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp6/board.mk b/src/board/system76/darp6/board.mk
index e0aab8d..6c60e38 100644
--- a/src/board/system76/darp6/board.mk
+++ b/src/board/system76/darp6/board.mk
@@ -37,5 +37,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp7/board.mk b/src/board/system76/darp7/board.mk
index c12806f..9ac5257 100644
--- a/src/board/system76/darp7/board.mk
+++ b/src/board/system76/darp7/board.mk
@@ -36,5 +36,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp8/board.mk b/src/board/system76/darp8/board.mk
index e1f0762..0b6768c 100644
--- a/src/board/system76/darp8/board.mk
+++ b/src/board/system76/darp8/board.mk
@@ -37,5 +37,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/darp9/board.mk b/src/board/system76/darp9/board.mk
index 1b1492f..e8641ed 100644
--- a/src/board/system76/darp9/board.mk
+++ b/src/board/system76/darp9/board.mk
@@ -39,5 +39,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index 1b66347..da4d126 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -35,5 +35,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=40 \
 	-DPOWER_LIMIT_DC=28
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp4/board.mk b/src/board/system76/galp4/board.mk
index a267cc0..4f912f7 100644
--- a/src/board/system76/galp4/board.mk
+++ b/src/board/system76/galp4/board.mk
@@ -38,5 +38,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=40 \
 	-DPOWER_LIMIT_DC=28
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk
index 439d1ee..ec3e961 100644
--- a/src/board/system76/galp5/board.mk
+++ b/src/board/system76/galp5/board.mk
@@ -40,6 +40,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(70, 25), \
 	FAN_POINT(80, 25), \
@@ -52,6 +53,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(70, 25), \
 	FAN_POINT(75, 40), \
diff --git a/src/board/system76/galp6/board.mk b/src/board/system76/galp6/board.mk
index 68c2b1d..1784ecf 100644
--- a/src/board/system76/galp6/board.mk
+++ b/src/board/system76/galp6/board.mk
@@ -42,5 +42,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/galp7/board.mk b/src/board/system76/galp7/board.mk
index 290475f..4384092 100644
--- a/src/board/system76/galp7/board.mk
+++ b/src/board/system76/galp7/board.mk
@@ -45,5 +45,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index a309dd8..23460c8 100644
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -34,6 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
@@ -46,6 +47,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
diff --git a/src/board/system76/gaze16-3050/board.mk b/src/board/system76/gaze16-3050/board.mk
index d484c80..589d211 100644
--- a/src/board/system76/gaze16-3050/board.mk
+++ b/src/board/system76/gaze16-3050/board.mk
@@ -39,6 +39,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -53,6 +54,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk
index 52a0812..2aa5baf 100644
--- a/src/board/system76/gaze16-3060-b/board.mk
+++ b/src/board/system76/gaze16-3060-b/board.mk
@@ -42,6 +42,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -56,6 +57,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS+=-DBOARD_FAN2_HEATUP=5
 CFLAGS+=-DBOARD_FAN2_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze16-3060/board.mk b/src/board/system76/gaze16-3060/board.mk
index b08f22a..c29734c 100644
--- a/src/board/system76/gaze16-3060/board.mk
+++ b/src/board/system76/gaze16-3060/board.mk
@@ -39,6 +39,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -53,6 +54,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk
index 97e8330..82200b9 100644
--- a/src/board/system76/gaze17-3050/board.mk
+++ b/src/board/system76/gaze17-3050/board.mk
@@ -42,6 +42,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=20
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -58,6 +59,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk
index c453d22..d1f0098 100644
--- a/src/board/system76/gaze17-3060-b/board.mk
+++ b/src/board/system76/gaze17-3060-b/board.mk
@@ -43,6 +43,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -57,6 +58,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze17-3060/board.mk b/src/board/system76/gaze17-3060/board.mk
index 4638946..2964ba0 100644
--- a/src/board/system76/gaze17-3060/board.mk
+++ b/src/board/system76/gaze17-3060/board.mk
@@ -40,6 +40,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -54,6 +55,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/gaze18/board.mk b/src/board/system76/gaze18/board.mk
index 1355eb7..cf06f02 100644
--- a/src/board/system76/gaze18/board.mk
+++ b/src/board/system76/gaze18/board.mk
@@ -42,6 +42,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -56,6 +57,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/lemp10/board.mk b/src/board/system76/lemp10/board.mk
index c75a56d..219b613 100644
--- a/src/board/system76/lemp10/board.mk
+++ b/src/board/system76/lemp10/board.mk
@@ -37,5 +37,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp11/board.mk b/src/board/system76/lemp11/board.mk
index 01f3431..f274f2c 100644
--- a/src/board/system76/lemp11/board.mk
+++ b/src/board/system76/lemp11/board.mk
@@ -38,5 +38,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp12/board.mk b/src/board/system76/lemp12/board.mk
index ade7fd3..53a5031 100644
--- a/src/board/system76/lemp12/board.mk
+++ b/src/board/system76/lemp12/board.mk
@@ -43,5 +43,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp13-b/board.mk b/src/board/system76/lemp13-b/board.mk
index 45f86b2..299a015 100644
--- a/src/board/system76/lemp13-b/board.mk
+++ b/src/board/system76/lemp13-b/board.mk
@@ -41,5 +41,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp13/board.mk b/src/board/system76/lemp13/board.mk
index 8b829de..6fcdc80 100644
--- a/src/board/system76/lemp13/board.mk
+++ b/src/board/system76/lemp13/board.mk
@@ -40,5 +40,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/lemp9/board.mk b/src/board/system76/lemp9/board.mk
index 47f3996..ff88004 100644
--- a/src/board/system76/lemp9/board.mk
+++ b/src/board/system76/lemp9/board.mk
@@ -34,5 +34,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=65 \
 	-DPOWER_LIMIT_DC=45
 
+CFLAGS += -DFAN1_PWM=DCR2
+
 # Add system76 common code
 include src/board/system76/common/common.mk
diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk
index bc9baf6..5c75098 100644
--- a/src/board/system76/oryp10/board.mk
+++ b/src/board/system76/oryp10/board.mk
@@ -45,6 +45,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -62,6 +63,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/oryp11/board.mk b/src/board/system76/oryp11/board.mk
index 5157aed..9be322d 100644
--- a/src/board/system76/oryp11/board.mk
+++ b/src/board/system76/oryp11/board.mk
@@ -52,6 +52,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -68,6 +69,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/oryp12/board.mk b/src/board/system76/oryp12/board.mk
index c34fdba..7c5fe11 100644
--- a/src/board/system76/oryp12/board.mk
+++ b/src/board/system76/oryp12/board.mk
@@ -45,6 +45,7 @@ CFLAGS += \
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -61,6 +62,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk
index 322c922..d2baf00 100644
--- a/src/board/system76/oryp5/board.mk
+++ b/src/board/system76/oryp5/board.mk
@@ -35,6 +35,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
@@ -47,6 +48,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index 9d27a4d..b45744c 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -37,6 +37,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -51,6 +52,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index 9d27a4d..b45744c 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -37,6 +37,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -51,6 +52,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk
index e3aec2e..d630e05 100644
--- a/src/board/system76/oryp8/board.mk
+++ b/src/board/system76/oryp8/board.mk
@@ -40,6 +40,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -54,6 +55,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
diff --git a/src/board/system76/oryp9/board.mk b/src/board/system76/oryp9/board.mk
index 4397fe8..23ab629 100644
--- a/src/board/system76/oryp9/board.mk
+++ b/src/board/system76/oryp9/board.mk
@@ -42,6 +42,7 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -59,6 +60,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\
diff --git a/src/board/system76/serw13/board.mk b/src/board/system76/serw13/board.mk
index 6b363eb..ee131af 100644
--- a/src/board/system76/serw13/board.mk
+++ b/src/board/system76/serw13/board.mk
@@ -49,6 +49,7 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
 # Custom fan curve
+CFLAGS += -DFAN1_PWM=DCR2
 CFLAGS += -DBOARD_FAN1_HEATUP=5
 CFLAGS += -DBOARD_FAN1_COOLDOWN=20
 CFLAGS += -DBOARD_FAN1_POINTS="\
@@ -64,6 +65,7 @@ CFLAGS += -DBOARD_FAN1_POINTS="\
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
 
+CFLAGS += -DFAN2_PWM=DCR4
 CFLAGS += -DBOARD_FAN2_HEATUP=5
 CFLAGS += -DBOARD_FAN2_COOLDOWN=20
 CFLAGS += -DBOARD_FAN2_POINTS="\