From 6e7b44f4f3ada7f365c34edf522eb5f2346fc25d Mon Sep 17 00:00:00 2001
From: Sean Rhodes <sean@starlabs.systems>
Date: Thu, 6 Feb 2025 19:52:53 +0000
Subject: [PATCH] ec/starlabs/merlin: Add an option to disable the fan

Add an option alongside the three existing curves to just turn
off the fan.

Change-Id: I39f6599056fe0116abbd7e2eb4084f77a7c395d3
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86304
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
---
 src/ec/starlabs/merlin/ec.h              | 1 +
 src/ec/starlabs/merlin/ite.c             | 5 +++--
 src/mainboard/starlabs/starbook/cfr.c    | 1 +
 src/mainboard/starlabs/starfighter/cfr.c | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h
index d5e1788e79..82572bde73 100644
--- a/src/ec/starlabs/merlin/ec.h
+++ b/src/ec/starlabs/merlin/ec.h
@@ -79,6 +79,7 @@
 #define FAN_NORMAL		0x00
 #define FAN_AGGRESSIVE		0xbb
 #define FAN_QUIET		0xaa
+#define FAN_DISABLED		0xcc
 
 /* Fn Lock State */
 #define UNLOCKED		0x00
diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index 1dd83a8c83..6eaa3e9915 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -175,14 +175,15 @@ static void merlin_init(struct device *dev)
 	 *
 	 * Setting:	fan_mode
 	 *
-	 * Values:	Quiet, Normal, Aggressive
+	 * Values:	Disabled, Quiet, Normal, Aggressive
 	 * Default:	Normal
 	 *
 	 */
 	const uint8_t fan_mode[] = {
 		FAN_NORMAL,
 		FAN_AGGRESSIVE,
-		FAN_QUIET
+		FAN_QUIET,
+		FAN_DISABLED
 	};
 
 	if (CONFIG(EC_STARLABS_FAN))
diff --git a/src/mainboard/starlabs/starbook/cfr.c b/src/mainboard/starlabs/starbook/cfr.c
index 82488fe660..9b47f48345 100644
--- a/src/mainboard/starlabs/starbook/cfr.c
+++ b/src/mainboard/starlabs/starbook/cfr.c
@@ -69,6 +69,7 @@ static const struct sm_object fan_mode = SM_DECLARE_ENUM({
 				{ "Normal",		0		},
 				{ "Aggressive",		1		},
 				{ "Quiet",		2		},
+				{ "Disabled",		3		},
 				SM_ENUM_VALUE_END			},
 });
 
diff --git a/src/mainboard/starlabs/starfighter/cfr.c b/src/mainboard/starlabs/starfighter/cfr.c
index 6802b751a3..7c8a123062 100644
--- a/src/mainboard/starlabs/starfighter/cfr.c
+++ b/src/mainboard/starlabs/starfighter/cfr.c
@@ -62,6 +62,7 @@ static const struct sm_object fan_mode = SM_DECLARE_ENUM({
 				{ "Normal",		0		},
 				{ "Aggressive",		1		},
 				{ "Quiet",		2		},
+				{ "Disabled",		3		},
 				SM_ENUM_VALUE_END			},
 });