diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-08-19 00:48:39 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2014-08-19 20:27:52 +0200 |
| commit | f319ae40d702b3012429d09a05633eadd18ea4c2 (patch) | |
| tree | 8d3fc9825431f716df61ce08d800cfd29be213cc | |
| parent | dc9cfa431e46d6083ebb83fff5be22de7969bb26 (diff) | |
| download | coreboot-f319ae40d702b3012429d09a05633eadd18ea4c2.tar.xz | |
lenovo/x201: Unpower USB on undocking
Change-Id: I9b496e8ff92ee575d0b780eab0cb45ea05506d30
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6708
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
| -rw-r--r-- | src/mainboard/lenovo/x201/acpi/dock.asl | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/dock.c | 8 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/gpio.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/mainboard/lenovo/x201/acpi/dock.asl b/src/mainboard/lenovo/x201/acpi/dock.asl index 33303d6a4c..75bdda4bb6 100644 --- a/src/mainboard/lenovo/x201/acpi/dock.asl +++ b/src/mainboard/lenovo/x201/acpi/dock.asl @@ -33,11 +33,13 @@ Scope (\_SB) { if (Arg0) { /* connect dock */ + Store (1, \GP28) Store (1, \_SB.PCI0.LPCB.EC.DKR1) Store (1, \_SB.PCI0.LPCB.EC.DKR2) Store (1, \_SB.PCI0.LPCB.EC.DKR3) } else { /* disconnect dock */ + Store (0, \GP28) Store (0, \_SB.PCI0.LPCB.EC.DKR1) Store (0, \_SB.PCI0.LPCB.EC.DKR2) Store (0, \_SB.PCI0.LPCB.EC.DKR3) diff --git a/src/mainboard/lenovo/x201/dock.c b/src/mainboard/lenovo/x201/dock.c index fbcf99e76a..087cf21220 100644 --- a/src/mainboard/lenovo/x201/dock.c +++ b/src/mainboard/lenovo/x201/dock.c @@ -42,16 +42,24 @@ void h8_mainboard_init_dock (void) void dock_connect(void) { + u16 gpiobase = pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc; + ec_set_bit(0x02, 0); ec_set_bit(0x1a, 0); ec_set_bit(0xfe, 4); + + outl(inl(gpiobase + 0x0c) | (1 << 28), gpiobase + 0x0c); } void dock_disconnect(void) { + u16 gpiobase = pci_read_config16(PCH_LPC_DEV, GPIO_BASE) & 0xfffc; + ec_clr_bit(0x02, 0); ec_clr_bit(0x1a, 0); ec_clr_bit(0xfe, 4); + + outl(inl(gpiobase + 0x0c) & ~(1 << 28), gpiobase + 0x0c); } int dock_present(void) diff --git a/src/mainboard/lenovo/x201/gpio.h b/src/mainboard/lenovo/x201/gpio.h index d9e9ff2e61..f01c9d96a7 100644 --- a/src/mainboard/lenovo/x201/gpio.h +++ b/src/mainboard/lenovo/x201/gpio.h @@ -156,7 +156,7 @@ const struct pch_gpio_set1 pch_gpio_set1_level = { .gpio25 = GPIO_LEVEL_HIGH, .gpio26 = GPIO_LEVEL_HIGH, .gpio27 = GPIO_LEVEL_HIGH, - .gpio28 = GPIO_LEVEL_HIGH, + .gpio28 = GPIO_LEVEL_LOW, .gpio29 = GPIO_LEVEL_HIGH, .gpio30 = GPIO_LEVEL_HIGH, .gpio31 = GPIO_LEVEL_HIGH, |