summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/t420
diff options
context:
space:
mode:
authorPatrick Rudolph <siro@das-labor.org>2017-06-08 11:26:26 +0200
committerMartin Roth <martinroth@google.com>2017-07-07 17:20:09 +0000
commit7ffb329f278d6b027bb3b3660b69e87f1ddd69d8 (patch)
tree0bc7b1deb7b889882eb6e4997eda880042806077 /src/mainboard/lenovo/t420
parentb21f5d708afe417cef8894a58c162ff50f987822 (diff)
downloadcoreboot-7ffb329f278d6b027bb3b3660b69e87f1ddd69d8.tar.xz
mb/lenovo/*/cmos: Port USB Always On
Port commit f1395d82: "ec/lenovo/h8: Add USB Always On" to other Thinkpad boards, as it seems to work fine on all generations. Change-Id: I6dcbfaae2a444d9a679ecb64a87dc2a59b8fd281 Signed-off-by: Patrick Rudolph <siro@das-labor.org> Reviewed-on: https://review.coreboot.org/20106 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Diffstat (limited to 'src/mainboard/lenovo/t420')
-rw-r--r--src/mainboard/lenovo/t420/cmos.default1
-rw-r--r--src/mainboard/lenovo/t420/cmos.layout5
-rw-r--r--src/mainboard/lenovo/t420/smihandler.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/mainboard/lenovo/t420/cmos.default b/src/mainboard/lenovo/t420/cmos.default
index 0fc3e553f6..d1fbcf6b27 100644
--- a/src/mainboard/lenovo/t420/cmos.default
+++ b/src/mainboard/lenovo/t420/cmos.default
@@ -14,3 +14,4 @@ fn_ctrl_swap=Disable
sticky_fn=Disable
trackpoint=Enable
hybrid_graphics_mode=Integrated Only
+usb_always_on=Disable \ No newline at end of file
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index 924b0f11ab..96cba62599 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -69,7 +69,7 @@ entries
418 1 e 1 sticky_fn
419 1 e 1 power_management_beeps
421 1 e 9 sata_mode
-#422 2 r 1 unused
+422 2 e 13 usb_always_on
# coreboot config options: cpu
#424 8 r 0 unused
@@ -137,6 +137,9 @@ enumerations
11 6 224M
12 0 Integrated Only
12 1 Discrete Only
+13 0 Disable
+13 1 AC and battery
+13 2 AC only
# -----------------------------------------------------------------
checksums
diff --git a/src/mainboard/lenovo/t420/smihandler.c b/src/mainboard/lenovo/t420/smihandler.c
index eff0daffdc..825a20b7e9 100644
--- a/src/mainboard/lenovo/t420/smihandler.c
+++ b/src/mainboard/lenovo/t420/smihandler.c
@@ -71,6 +71,8 @@ int mainboard_smi_apmc(u8 data)
void mainboard_smi_sleep(u8 slp_typ)
{
+ h8_usb_always_on();
+
if (slp_typ == 3) {
u8 ec_wake = ec_read(0x32);
/* If EC wake events are enabled, enable wake on EC WAKE GPE. */