summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2023-08-16 09:25:42 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-08-30 14:11:44 +0000
commitcbedae116cccbb6399f854d4392c28b710705323 (patch)
treef708e6f16f7fd5318ac83d664a29ac767827870a
parent29514472085b43612abdb6ae50a0b46e4a60dec9 (diff)
ec/starlabs/merlin: Unconditionally enable the Keyboard Backlight
KBL_STATE was originally intended to provide more granular control of the keyboard backlight. However, KBL_BRIGHTNESS has a valid value of "off" which achieves the same thing. Therefore, unconditionally set the KBL_STATE to enabled, and rely on KBL_BRIGHTNESS. Change-Id: Ic7ee6b96b1dcaa6633b111e92097bce87908885e Signed-off-by: Sean Rhodes <sean@starlabs.systems> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77201 Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/ec/starlabs/merlin/ite.c12
-rw-r--r--src/ec/starlabs/merlin/nuvoton.c12
2 files changed, 6 insertions, 18 deletions
diff --git a/src/ec/starlabs/merlin/ite.c b/src/ec/starlabs/merlin/ite.c
index 9916bf09ed..d7ae168af1 100644
--- a/src/ec/starlabs/merlin/ite.c
+++ b/src/ec/starlabs/merlin/ite.c
@@ -295,17 +295,11 @@ static void merlin_init(struct device *dev)
* Values: Off, On
* Default: On
*
+ * Note: Always enable, as the brightness level of `off` disables it.
+ *
*/
- const uint8_t kbl_state[] = {
- KBL_DISABLED,
- KBL_ENABLED
- };
- ec_write(ECRAM_KBL_STATE,
- get_ec_value_from_option("kbl_state",
- 1,
- kbl_state,
- ARRAY_SIZE(kbl_state)));
+ ec_write(ECRAM_KBL_STATE, KBL_ENABLED);
}
static struct device_operations ops = {
diff --git a/src/ec/starlabs/merlin/nuvoton.c b/src/ec/starlabs/merlin/nuvoton.c
index f4b2bb4d49..bad8d1b4ec 100644
--- a/src/ec/starlabs/merlin/nuvoton.c
+++ b/src/ec/starlabs/merlin/nuvoton.c
@@ -256,17 +256,11 @@ static void merlin_init(struct device *dev)
* Values: Off, On
* Default: On
*
+ * Note: Always enable, as the brightness level of `off` disables it.
+ *
*/
- const uint8_t kbl_state[] = {
- KBL_DISABLED,
- KBL_ENABLED
- };
- ec_write(ECRAM_KBL_STATE,
- get_ec_value_from_option("kbl_state",
- 1,
- kbl_state,
- ARRAY_SIZE(kbl_state)));
+ ec_write(ECRAM_KBL_STATE, KBL_ENABLED);
}
static struct device_operations ops = {