[XS] Change in coreboot[main]: ec/starlabs/merlin: Add an option to disable the fan

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86304?usp=email )

Change subject: ec/starlabs/merlin: Add an option to disable the fan
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86304
Tested-by: build bot (Jenkins) 
Reviewed-by: Matt DeVillier 
---
M src/ec/starlabs/merlin/ec.h
M src/ec/starlabs/merlin/ite.c
M src/mainboard/starlabs/starbook/cfr.c
M src/mainboard/starlabs/starfighter/cfr.c
4 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Matt DeVillier: Looks good to me, approved

diff --git a/src/ec/starlabs/merlin/ec.h b/src/ec/starlabs/merlin/ec.h
index d5e1788..82572bd 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 1dd83a8..6eaa3e9 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -175,14 +175,15 @@
     *
     * 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 82488fe..9b47f483 100644
--- a/src/mainboard/starlabs/starbook/cfr.c
+++ b/src/mainboard/starlabs/starbook/cfr.c
@@ -69,6 +69,7 @@
    			{ "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 6802b75..7c8a123 100644
--- a/src/mainboard/starlabs/starfighter/cfr.c
+++ b/src/mainboard/starlabs/starfighter/cfr.c
@@ -62,6 +62,7 @@
    			{ "Normal",		0		},
    			{ "Aggressive",		1		},
    			{ "Quiet",		2		},
+				{ "Disabled",		3		},
    			SM_ENUM_VALUE_END			},
 });