Hello Patrick Rudolph,
I'd like you to do a code review. Please visit
https://review.coreboot.org/29032
to review the following change.
Change subject: mb/lenovo/x1_carbon_gen1/cmos: Port USB Always On ......................................................................
mb/lenovo/x1_carbon_gen1/cmos: Port USB Always On
Port commit f1395d82: "ec/lenovo/h8: Add USB Always On" to the Thinkpad x1_carbon_gen1 board as well, as it seems to work fine on all generations.
See also commit 7ffb329f278d6b027bb3b3660b69e87f1ddd69d8
Change-Id: Ib9070b659b0c9ad5dde4200ec2845c6fa2b78b25 Signed-off-by: Patrick Rudolph siro@das-labor.org Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/x1_carbon_gen1/cmos.default M src/mainboard/lenovo/x1_carbon_gen1/cmos.layout M src/mainboard/lenovo/x1_carbon_gen1/smihandler.c 3 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/29032/1
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.default b/src/mainboard/lenovo/x1_carbon_gen1/cmos.default index 3044c6c..bcabae5 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.default +++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.default @@ -13,3 +13,4 @@ sticky_fn=Disable trackpoint=Enable backlight=Both +usb_always_on=Disable \ No newline at end of file diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout index ad5a489..bb25261 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout +++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout @@ -67,7 +67,7 @@ 416 1 e 1 trackpoint 417 1 e 1 fn_ctrl_swap 418 1 e 1 sticky_fn -#419 2 r 0 unused +419 2 e 12 usb_always_on 421 1 e 9 sata_mode 422 2 e 10 backlight
@@ -126,6 +126,9 @@ 11 4 160M 11 5 192M 11 6 224M +12 0 Disable +12 1 AC and battery +12 2 AC only
# ----------------------------------------------------------------- checksums diff --git a/src/mainboard/lenovo/x1_carbon_gen1/smihandler.c b/src/mainboard/lenovo/x1_carbon_gen1/smihandler.c index 2425927..a69b78f 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/smihandler.c +++ b/src/mainboard/lenovo/x1_carbon_gen1/smihandler.c @@ -72,6 +72,8 @@
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. */