erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ec/starlabs/merlin: Remove the fast charge option

Browse source 
This is a legacy option that changed the charging frequency. It
is no longer needed as the "normal" frequency is faster and more
stable so remove it.

Change-Id: I73cf439d96d65f0be26595e42a4aedbc4388b850
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89694
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Sean Rhodes 2025-10-23 20:33:32 +01:00
commit 84a348f4bf
8 changed files with 0 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ec/starlabs/merlin/Kconfig
View file

@ -43,13 +43,6 @@ config EC_STARLABS_FAN
help
Select if the mainboard has a fan.
config EC_STARLABS_FAST_CHARGE
bool
default n
depends on EC_STARLABS_NUVOTON
help
Select if the mainboard supports fast charging.
config EC_STARLABS_MAX_CHARGE
bool
default n

23
src/ec/starlabs/merlin/nuvoton.c
View file

@ -165,29 +165,6 @@ static void merlin_init(struct device *dev)
UINT_MAX,
UINT_MAX));
/*
* Fast Charge
*
* Setting: fast_charge
*
* Values: Normal, Fast
* Default: Normal
*
*/
const uint8_t fast_charge[] = {
CHARGE_RATE_NORMAL,
CHARGE_RATE_FAST
};
if (CONFIG(EC_STARLABS_FAST_CHARGE))
ec_write(ECRAM_FAST_CHARGE,
get_ec_value_from_option("fast_charge",
0,
fast_charge,
ARRAY_SIZE(fast_charge),
UINT_MAX,
UINT_MAX));
/*
* Fan Mode
*

1
src/ec/starlabs/merlin/variants/glk/ecdefs.h
View file

@ -19,7 +19,6 @@
#define ECRAM_FN_CTRL_REVERSE 0x2d
#define ECRAM_MAX_CHARGE dead_code_t(uint8_t)
#define ECRAM_FAN_MODE dead_code_t(uint8_t)
#define ECRAM_FAST_CHARGE dead_code_t(uint8_t)
#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t)
#define ECRAM_LID_SWITCH dead_code_t(uint8_t)
#define ECRAM_POWER_LED 0x1f

1
src/ec/starlabs/merlin/variants/glkr/ecdefs.h
View file

@ -22,7 +22,6 @@
#define ECRAM_FN_CTRL_REVERSE 0x13
#define ECRAM_MAX_CHARGE dead_code_t(uint8_t)
#define ECRAM_FAN_MODE dead_code_t(uint8_t)
#define ECRAM_FAST_CHARGE 0x18
#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t)
#define ECRAM_LID_SWITCH dead_code_t(uint8_t)
#define ECRAM_POWER_LED 0x1f

1
src/ec/starlabs/merlin/variants/kbl/ecdefs.h
View file

@ -19,7 +19,6 @@
#define ECRAM_FAN_MODE 0x42
#define ECRAM_FN_CTRL_REVERSE 0x43
#define ECRAM_MAX_CHARGE dead_code_t(uint8_t)
#define ECRAM_FAST_CHARGE dead_code_t(uint8_t)
#define ECRAM_CHARGING_SPEED dead_code_t(uint8_t)
#define ECRAM_LID_SWITCH dead_code_t(uint8_t)
#define ECRAM_POWER_LED 0x1f

1
src/ec/starlabs/merlin/variants/merlin/ecdefs.h
View file

@ -19,7 +19,6 @@
#define ECRAM_FN_CTRL_REVERSE 0x17
#define ECRAM_MAX_CHARGE 0x1a
#define ECRAM_FAN_MODE 0x1b
#define ECRAM_FAST_CHARGE dead_code_t(uint8_t)
#define ECRAM_CHARGING_SPEED 0x1d
#define ECRAM_LID_SWITCH 0x1e
#define ECRAM_POWER_LED 0x1f

1
src/mainboard/starlabs/lite/Kconfig
View file

@ -32,7 +32,6 @@ config BOARD_STARLABS_LITE_GLK
config BOARD_STARLABS_LITE_GLKR
select BOARD_STARLABS_LITE_SERIES
select EC_STARLABS_FAST_CHARGE
select EC_STARLABS_NUVOTON
select EC_STARLABS_KBL_LEVELS
select SOC_INTEL_GEMINILAKE

12
src/mainboard/starlabs/lite/cfr.c
View file

@ -14,15 +14,6 @@ static const struct sm_object card_reader = SM_DECLARE_BOOL({
.default_value = true,
});
#if CONFIG(EC_STARLABS_FAST_CHARGE)
static const struct sm_object fast_charge = SM_DECLARE_BOOL({
.opt_name = "fast_charge",
.ui_name = "Fast Charge",
.ui_helptext = "Charge the battery faster at the cost of heat and battery wear.",
.default_value = false,
});
#endif
static const struct sm_object power_profile = SM_DECLARE_ENUM({
.opt_name = "power_profile",
.ui_name = "Power Profile",
@ -93,9 +84,6 @@ static struct sm_obj_form processor = {
static struct sm_obj_form power = {
.ui_name = "Power",
.obj_list = (const struct sm_object *[]) {
#if CONFIG(EC_STARLABS_FAST_CHARGE)
&fast_charge,
#endif
&power_on_after_fail_bool,
NULL
},