Patch set updated for coreboot: 938d2a7 lenovo/t520: Fix ExpressCard hotplug

[Nicolas Reinecke]

Nicolas Reinecke ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6735

-gerrit

commit 938d2a736b6cbc7ecbe55794ffa35cccc5636370
Author: Nicolas Reinecke 
Date:   Fri Aug 22 15:10:49 2014 +0200

lenovo/t520: Fix ExpressCard hotplug

Thinkpad T520 ExpressCard Slot PCIe lanes are connected to port 4.
    Tested with Serial Port Card.

Change-Id: I459943d427578d135f9aed1aa66da269ddfeee87
    Signed-off-by: Nicolas Reinecke 
---
 src/mainboard/lenovo/t520/dsdt.asl    | 2 +-
 src/mainboard/lenovo/t520/mainboard.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index 0e7a965..e48a590 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -23,7 +23,7 @@
 #define BRIGHTNESS_UP _SB.PCI0.GFX0.LCD0.INCB
 #define BRIGHTNESS_DOWN _SB.PCI0.GFX0.LCD0.DECB
 #define ACPI_VIDEO_DEVICE _SB.PCI0.GFX0
-#define RP03_IS_EXPRESSCARD 1
+#define RP04_IS_EXPRESSCARD 1
 #define HAVE_LCD_SCREEN 1

DefinitionBlock(
diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index c37e6b9..8b1aa0d 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/mainboard.c
@@ -158,12 +158,11 @@ static void mainboard_init(device_t dev)
    pc_keyboard_init();

/* Enable expresscard hotplug events.  */
-	pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
+	pci_write_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
    		   0xd8,
-			   pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 2)), 0xd8)
+			   pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x1c, 3)), 0xd8)
    		   | (1 << 30));
-
-	pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 2)),
+	pci_write_config16(dev_find_slot(0, PCI_DEVFN(0x1c, 3)),
    		   0x42, 0x142);
 }