[coreboot-gerrit] Patch set updated for coreboot: aa04a81 Lenovo T60/X60/X201: Add option to enable 3G modem (WWAN)

[Paul Menzel (paulepanter@users.sourceforge.net)]

Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4056

-gerrit

commit aa04a81ed87ffde0dfcfddecff8ea293aaa3ebc3
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Wed Nov 13 21:53:23 2013 +0100

    Lenovo T60/X60/X201: Add option to enable 3G modem (WWAN)
    
    Just like Bluetooth and WLAN the 3G modem/WWAN needs to be
    enabled in the EC. Do it analogously to these two options.
    
    Change-Id: Ia4bfeb6fb05c6f61a47340e4213e72df5dae179b
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/ec/lenovo/h8/h8.c                | 11 +++++++++++
 src/mainboard/lenovo/t60/cmos.layout |  1 +
 src/mainboard/lenovo/x60/cmos.layout |  1 +
 3 files changed, 13 insertions(+)

diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 9ffdfc1..efbb907 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -50,6 +50,14 @@ void h8_wlan_enable(int on)
 		ec_clr_bit(0x3a, 5);
 }
 
+static void h8_wwan_enable(int on) /* 3G device */
+{
+	if (on)
+		ec_set_bit(0x3a, 6);
+	else
+		ec_clr_bit(0x3a, 6);
+}
+
 static void h8_log_ec_version(void)
 {
 	unsigned char ecfw[9], c;
@@ -154,6 +162,9 @@ static void h8_enable(device_t dev)
 	if (!get_option(&val, "bluetooth"))
 		h8_bluetooth_enable(val);
 
+	if (!get_option(&val, "wwan"))
+		h8_wwan_enable(val);
+
 	if (!get_option(&val, "first_battery")) {
 		tmp = ec_read(H8_CONFIG3);
 		tmp &= ~(1 << 4);
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 670c515..a179752 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -109,6 +109,7 @@ entries
 
 1060         1       e       1        touchpad
 1061         1       e       1        bluetooth
+1062         1       e       1        wwan
 1064         8       h       0        volume
 1072         1       e       9        first_battery
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index 8d18525..653e786 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -111,6 +111,7 @@ entries
 1072         8       h       0        tft_brightness
 1080         1       e       9        first_battery
 1081         1       e       1        bluetooth
+1082         1       e       1        wwan
 # -----------------------------------------------------------------
 
 enumerations