summaryrefslogtreecommitdiff
path: root/src/mainboard/lenovo/x200
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/lenovo/x200')
-rw-r--r--src/mainboard/lenovo/x200/acpi/gpe.asl14
-rw-r--r--src/mainboard/lenovo/x200/devicetree.cb1
-rw-r--r--src/mainboard/lenovo/x200/dsdt.asl1
-rw-r--r--src/mainboard/lenovo/x200/romstage.c8
4 files changed, 1 insertions, 23 deletions
diff --git a/src/mainboard/lenovo/x200/acpi/gpe.asl b/src/mainboard/lenovo/x200/acpi/gpe.asl
index cc6075f223..3120cafe2f 100644
--- a/src/mainboard/lenovo/x200/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x200/acpi/gpe.asl
@@ -26,18 +26,4 @@ Scope (\_GPE)
/* Read EC register to clear wake status */
Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
}
-
- Method (_L01, 0, NotSerialized)
- {
- If (\_SB.PCI0.RP04.HPCS)
- {
- Sleep (100)
- Store (0x01, \_SB.PCI0.RP04.HPCS)
- If (\_SB.PCI0.RP04.PDC)
- {
- Store (0x01, \_SB.PCI0.RP04.PDC)
- Notify (\_SB.PCI0.RP04, 0x00)
- }
- }
- }
}
diff --git a/src/mainboard/lenovo/x200/devicetree.cb b/src/mainboard/lenovo/x200/devicetree.cb
index 376273a3f2..acc6c3a742 100644
--- a/src/mainboard/lenovo/x200/devicetree.cb
+++ b/src/mainboard/lenovo/x200/devicetree.cb
@@ -71,6 +71,7 @@ chip northbridge/intel/gm45
# Set power limits to 10 * 10^0 watts.
# Maybe we should set less for Mini PCIe.
register "pcie_power_limits" = "{ { 10, 0 }, { 10, 0 }, { 0, 0 }, { 10, 0 }, { 0, 0 }, { 0, 0 } }"
+ register "pcie_hotplug_map" = "{ 0, 0, 0, 1, 0, 0, 0, 0 }"
chip drivers/generic/ioapic
register "have_isa_interrupts" = "1"
diff --git a/src/mainboard/lenovo/x200/dsdt.asl b/src/mainboard/lenovo/x200/dsdt.asl
index eb6ce6dc95..0409e66437 100644
--- a/src/mainboard/lenovo/x200/dsdt.asl
+++ b/src/mainboard/lenovo/x200/dsdt.asl
@@ -23,7 +23,6 @@
#define BRIGHTNESS_UP \_SB.PCI0.GFX0.LCD0.INCB
#define BRIGHTNESS_DOWN \_SB.PCI0.GFX0.LCD0.DECB
#define ACPI_VIDEO_DEVICE \_SB.PCI0.GFX0
-#define RP04_IS_EXPRESSCARD 1
#define DISPLAY_DEVICE_2_IS_LCD_SCREEN 1
DefinitionBlock(
diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index dcb4e16415..1c0668fb99 100644
--- a/src/mainboard/lenovo/x200/romstage.c
+++ b/src/mainboard/lenovo/x200/romstage.c
@@ -77,14 +77,6 @@ void main(unsigned long bist)
int cbmem_initted;
u16 reg16;
- /* Enable expresscard hotplug events. */
- pci_write_config32(PCI_DEV (0, 0x1c, 3),
- 0xd8,
- pci_read_config32(PCI_DEV (0, 0x1c, 3), 0xd8)
- | (1 << 30));
- pci_write_config16(PCI_DEV (0, 0x1c, 3),
- 0x42, 0x141);
-
/* basic northbridge setup, including MMCONF BAR */
gm45_early_init();