summaryrefslogtreecommitdiff
path: root/src/ec/starlabs/merlin
diff options
context:
space:
mode:
Diffstat (limited to 'src/ec/starlabs/merlin')
-rw-r--r--src/ec/starlabs/merlin/Kconfig7
-rw-r--r--src/ec/starlabs/merlin/ec.c11
2 files changed, 13 insertions, 5 deletions
diff --git a/src/ec/starlabs/merlin/Kconfig b/src/ec/starlabs/merlin/Kconfig
index 67582ac4a7..93101b74ec 100644
--- a/src/ec/starlabs/merlin/Kconfig
+++ b/src/ec/starlabs/merlin/Kconfig
@@ -44,6 +44,13 @@ config EC_STARLABS_FAN
help
Select if the mainboard has a fan.
+config EC_STARLABS_MAX_CHARGE
+ bool
+ default n
+ depends on EC_STARLABS_ITE
+ help
+ Select if the mainboard supports limiting the maximum charge of the battery.
+
config EC_STARLABS_MERLIN
bool "Use open-source Merlin EC Firmware"
default n
diff --git a/src/ec/starlabs/merlin/ec.c b/src/ec/starlabs/merlin/ec.c
index 40be138a82..e8eaa229d7 100644
--- a/src/ec/starlabs/merlin/ec.c
+++ b/src/ec/starlabs/merlin/ec.c
@@ -130,11 +130,12 @@ static void merlin_init(struct device *dev)
CHARGE_60
};
- ec_write(ECRAM_MAX_CHARGE,
- get_ec_value_from_option("max_charge",
- 0,
- max_charge,
- ARRAY_SIZE(max_charge)));
+ if (CONFIG(EC_STARLABS_MAX_CHARGE))
+ ec_write(ECRAM_MAX_CHARGE,
+ get_ec_value_from_option("max_charge",
+ 0,
+ max_charge,
+ ARRAY_SIZE(max_charge)));
/*
* Fan Mode