From 2c8766891444eb49db2ec54146c7e83c0c1f8304 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 13 Nov 2013 18:31:24 +0100 Subject: ec/lenovo/h8: Fix peripheral init without CMOS config Currently H8 skips important init if unable to access CMOS config. Change default to enable all features to have a sane system without using CMOS config. Change-Id: I4448ccd21beae8ad23eb22391770c6fe3b83e3b4 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/4515 Reviewed-by: Alexandru Gagniuc Tested-by: build bot (Jenkins) --- src/ec/lenovo/h8/h8.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/ec/lenovo/h8') diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index d0a9ea956b..ac77001229 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -171,16 +171,17 @@ static void h8_enable(device_t dev) if (get_option(&val, "volume") == CB_SUCCESS) ec_write(H8_VOLUME_CONTROL, val); + if (get_option(&val, "bluetooth") != CB_SUCCESS) + val = 1; + h8_bluetooth_enable(val); - if (get_option(&val, "bluetooth") == CB_SUCCESS) - h8_bluetooth_enable(val); + if (get_option(&val, "first_battery") != CB_SUCCESS) + val = 1; - if (get_option(&val, "first_battery") == CB_SUCCESS) { - tmp = ec_read(H8_CONFIG3); - tmp &= ~(1 << 4); - tmp |= (val & 1)<< 4; - ec_write(H8_CONFIG3, tmp); - } + tmp = ec_read(H8_CONFIG3); + tmp &= ~(1 << 4); + tmp |= (val & 1) << 4; + ec_write(H8_CONFIG3, tmp); h8_set_audio_mute(0); #if !IS_ENABLED(CONFIG_H8_DOCK_EARLY_INIT) -- cgit v1.2.3