[coreboot-gerrit] Patch set updated for coreboot: NOTFORMERGE: ec/lenovo/h8: wlan/trackpoint/touchpad/bluetooth/wwan

[Francis Rowe]

Francis Rowe ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7058

-gerrit

commit 43b84826cfd34b81243db2ce23c57270c00e2c1d
Author: Francis Rowe 
Date:   Mon Oct 13 00:14:53 2014 +0100

NOTFORMERGE: ec/lenovo/h8: wlan/trackpoint/touchpad/bluetooth/wwan

Permanently enable them.

Change-Id: Ic76ab9ab9c865f30312378e18af58bece6c3260a
    Signed-off-by: Francis Rowe 
---
 3rdparty/blobs            |  2 +-
 src/ec/lenovo/h8/h8.c     | 17 +++++++----------
 src/ec/lenovo/pmh7/pmh7.c | 11 ++++-------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/3rdparty/blobs b/3rdparty/blobs
index 34b0926..14739c7 160000
--- a/3rdparty/blobs
+++ b/3rdparty/blobs
@@ -1 +1 @@
-Subproject commit 34b09265063c19ea5d61bd5a2f057b47b5aa2232
+Subproject commit 14739c76936455b18a759dd2789fd4d13b16da67
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 46480f4..bd55832 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -252,9 +252,9 @@ static void h8_enable(struct device *dev)

ec_write(H8_FAN_CONTROL, H8_FAN_CONTROL_AUTO);

-	if (get_option(&val, "wlan") != CB_SUCCESS)
-		val = 1;
-	h8_wlan_enable(val);
+	// Permanently enable wifi
+	// see http://libreboot.org/docs/index.html#recommended_wifi
+	h8_wlan_enable(1);

h8_trackpoint_enable(1);
    h8_usb_power_enable(1);
@@ -262,14 +262,11 @@ static void h8_enable(struct device *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, "wwan") != CB_SUCCESS)
-		val = 1;
+	// Permanently enable bluetooth
+	h8_bluetooth_enable(1);

-	h8_wwan_enable(val);
+	// Permanently enable wwan
+	h8_wwan_enable(1);

if (conf->has_uwb) {
    	if (get_option(&val, "uwb") != CB_SUCCESS)
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index cc6e891..38aef16 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -106,7 +106,6 @@ static void enable_dev(struct device *dev)
 {
    struct ec_lenovo_pmh7_config *conf = dev->chip_info;
    struct resource *resource;
-	u8 val;

resource = new_resource(dev, EC_LENOVO_PMH7_INDEX);
    resource->flags = IORESOURCE_IO | IORESOURCE_FIXED;
@@ -118,13 +117,11 @@ static void enable_dev(struct device *dev)
    pmh7_backlight_enable(conf->backlight_enable);
    pmh7_dock_event_enable(conf->dock_event_enable);

-	if (get_option(&val, "touchpad") != CB_SUCCESS)
-		val = 1;
-	pmh7_touchpad_enable(val);
+	// Permanently enable touchpad
+	pmh7_touchpad_enable(1);

-	if (get_option(&val, "trackpoint") != CB_SUCCESS)
-		val = 1;
-	pmh7_trackpoint_enable(val);
+	// Permanently enable trackpoint
+	pmh7_trackpoint_enable(1);
 }

struct chip_operations ec_lenovo_pmh7_ops = {