diff options
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/lenovo/x201/cmos.default | 1 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/cmos.layout | 6 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/smihandler.c | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x220/cmos.default | 1 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x220/cmos.layout | 5 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x220/smihandler.c | 2 |
6 files changed, 14 insertions, 3 deletions
diff --git a/src/mainboard/lenovo/x201/cmos.default b/src/mainboard/lenovo/x201/cmos.default index 50d17aefd2..9f1e31ded2 100644 --- a/src/mainboard/lenovo/x201/cmos.default +++ b/src/mainboard/lenovo/x201/cmos.default @@ -15,3 +15,4 @@ sticky_fn=Disable power_management_beeps=Enable low_battery_beep=Enable sata_mode=AHCI +usb_always_on=Disable diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout index 2a91eb71bb..72702328fb 100644 --- a/src/mainboard/lenovo/x201/cmos.layout +++ b/src/mainboard/lenovo/x201/cmos.layout @@ -70,8 +70,8 @@ entries 419 1 e 1 power_management_beeps 420 1 e 1 low_battery_beep 421 1 e 9 sata_mode - -#422 2 r 0 unused +422 1 e 11 usb_always_on +#423 1 r 1 unused # coreboot config options: northbridge 424 3 e 10 gfx_uma_size @@ -123,6 +123,8 @@ enumerations 10 3 128M 10 5 96M 10 6 160M +11 0 Disable +11 1 AC and battery # ----------------------------------------------------------------- checksums diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c index 591a52112e..f00ae0dcdc 100644 --- a/src/mainboard/lenovo/x201/smihandler.c +++ b/src/mainboard/lenovo/x201/smihandler.c @@ -178,6 +178,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. */ diff --git a/src/mainboard/lenovo/x220/cmos.default b/src/mainboard/lenovo/x220/cmos.default index 1b8e212894..91331ab22e 100644 --- a/src/mainboard/lenovo/x220/cmos.default +++ b/src/mainboard/lenovo/x220/cmos.default @@ -10,6 +10,7 @@ wwan=Enable wlan=Enable touchpad=Enable sata_mode=AHCI +usb_always_on=Disable fn_ctrl_swap=Disable sticky_fn=Disable trackpoint=Enable diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout index 143ee807cd..0f57058ca2 100644 --- a/src/mainboard/lenovo/x220/cmos.layout +++ b/src/mainboard/lenovo/x220/cmos.layout @@ -69,7 +69,8 @@ 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 1 e 12 usb_always_on +#423 1 r 1 unused # coreboot config options: cpu 424 1 e 2 hyper_threading @@ -134,6 +135,8 @@ enumerations 11 4 160M 11 5 192M 11 6 224M +12 0 Disable +12 1 AC and battery # ----------------------------------------------------------------- checksums diff --git a/src/mainboard/lenovo/x220/smihandler.c b/src/mainboard/lenovo/x220/smihandler.c index 08554c93ec..e1bb37698f 100644 --- a/src/mainboard/lenovo/x220/smihandler.c +++ b/src/mainboard/lenovo/x220/smihandler.c @@ -133,6 +133,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. */ |