aboutsummaryrefslogtreecommitdiff
path: root/src/ec
diff options
context:
space:
mode:
authorBill XIE <persmule@hardenedlinux.org>2019-10-28 00:16:05 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-11-12 08:26:42 +0000
commit72f13e534bed0be4a3bc0999dc2fe772c322114f (patch)
tree0e5978ba8d6d6d2f5d60f20b32f5d4f764b3ebc1 /src/ec
parent9764bc126ea8718cdc723714d8355e51e71aa65f (diff)
ec/lenovo/h8: Make dock init in ramstage fully mainboard-specific
Discussed in CB:36093, in the past many lenovo boards need to declare an empty h8_mainboard_init_dock() to satisfy h8.c. Now the confusing H8_DOCK_EARLY_INIT might be retired, and if a mainboard needs dock init (done with h8_mainboard_init_dock() in the past) in ramstage, (discussed in CB:4294 where H8_DOCK_EARLY_INIT is introduced) it can just do it in its own chip_ops.enable_dev function. Tested on X200. Testing on other affected targets may be necessary. Change-Id: I5737406d1f6cb6e91b2e2fa349a206a3dba988d1 Signed-off-by: Bill XIE <persmule@hardenedlinux.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36385 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/ec')
-rw-r--r--src/ec/lenovo/h8/Kconfig5
-rw-r--r--src/ec/lenovo/h8/h8.c4
-rw-r--r--src/ec/lenovo/h8/h8.h2
3 files changed, 1 insertions, 10 deletions
diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig
index f3df56a6c5..6bd290f50e 100644
--- a/src/ec/lenovo/h8/Kconfig
+++ b/src/ec/lenovo/h8/Kconfig
@@ -44,7 +44,4 @@ config H8_HAS_PRIMARY_FN_KEYS
bool
default n
-endif
-
-config H8_DOCK_EARLY_INIT
- bool
+endif # EC_LENOVO_H8
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 3a99b52dd8..93a771c47d 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -353,10 +353,6 @@ static void h8_enable(struct device *dev)
h8_charge_priority(val);
h8_set_audio_mute(0);
-
-#if !CONFIG(H8_DOCK_EARLY_INIT)
- h8_mainboard_init_dock();
-#endif
}
struct chip_operations ec_lenovo_h8_ops = {
diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h
index 14948c55ce..6dad2889ad 100644
--- a/src/ec/lenovo/h8/h8.h
+++ b/src/ec/lenovo/h8/h8.h
@@ -36,8 +36,6 @@ int h8_ultrabay_device_present(void);
u8 h8_build_id_and_function_spec_version(char *buf, u8 buf_len);
void h8_usb_always_on(void);
-void h8_mainboard_init_dock (void);
-
int h8_get_fn_key(void);
int h8_get_sense_ready(void);