[coreboot-gerrit] Patch set updated for coreboot: c8cec5d ec/lenovo/h8: Fix peripheral init without CMOS config

Vladimir Serbinenko (phcoder@gmail.com) gerrit at coreboot.org
Sun Dec 15 01:35:58 CET 2013


Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4515

-gerrit

commit c8cec5df442919111e9e05a095c3a904ba88fc23
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Wed Nov 13 18:31:24 2013 +0100

    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 <phcoder at gmail.com>
---
 src/ec/lenovo/h8/h8.c     | 17 +++++++++--------
 src/ec/lenovo/pmh7/pmh7.c |  5 +++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index d0a9ea9..ac77001 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)
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index b02b52a..9607c83 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -113,8 +113,9 @@ static void enable_dev(device_t dev)
 	pmh7_backlight_enable(conf->backlight_enable);
 	pmh7_dock_event_enable(conf->dock_event_enable);
 
-	if (get_option(&val, "touchpad") == CB_SUCCESS)
-		pmh7_touchpad_enable(val);
+	if (get_option(&val, "touchpad") != CB_SUCCESS)
+		val = 1;
+	pmh7_touchpad_enable(val);
 }
 
 struct chip_operations ec_lenovo_pmh7_ops = {



More information about the coreboot-gerrit mailing list