[coreboot-gerrit] Patch set updated for coreboot: 92b29a6 lynxpoint: Fix XHCI controller device in ACPI

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4181

-gerrit

commit 92b29a6c15ece0ed15bc97b9f58f83b855e21a02
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Wed May 22 09:51:11 2013 -0700

    lynxpoint: Fix XHCI controller device in ACPI
    
    The ACPI code was defining two EHCI controllers and ignoring
    the XHCI controller.  This changes the second EHCI controller
    to be XHCI instead and changes the wake resource to indicate
    S3 and not S4.
    
    cat /proc/acpi/wakeup
    
    Device  S-state   Status   Sysfs node
    HDEF      S4    *disabled  pci:0000:00:1b.0
    EHCI      S3    *enabled   pci:0000:00:1d.0
    XHCI      S3    *enabled   pci:0000:00:14.0
    
    Change-Id: If28775e6ef8608c22c85ca91d91d1f598ec7755d
    Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
    Reviewed-on: https://gerrit.chromium.org/gerrit/56263
    Reviewed-by: Aaron Durbin <adurbin at chromium.org>
---
 src/southbridge/intel/lynxpoint/acpi/usb.asl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/southbridge/intel/lynxpoint/acpi/usb.asl b/src/southbridge/intel/lynxpoint/acpi/usb.asl
index cf3e6a0..5c1f6a5 100644
--- a/src/southbridge/intel/lynxpoint/acpi/usb.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/usb.asl
@@ -23,11 +23,11 @@
 
 // EHCI Controller 0:1d.0
 
-Device (EHC1)
+Device (EHCI)
 {
 	Name(_ADR, 0x001d0000)
 
-	Name (_PRW, Package(){ 13, 4 }) // Power Resources for Wake
+	Name (_PRW, Package(){ 13, 3 }) // Power Resources for Wake
 
 	// Leave USB ports on for to allow Wake from USB
 
@@ -55,13 +55,13 @@ Device (EHC1)
 	}
 }
 
-// EHCI #2 Controller 0:1a.0
+// XHCI Controller 0:14.0
 
-Device (EHC2)
+Device (XHCI)
 {
-	Name(_ADR, 0x001a0000)
+	Name(_ADR, 0x00140000)
 
-	Name (_PRW, Package(){ 13, 4 }) // Power Resources for Wake
+	Name (_PRW, Package(){ 13, 3 }) // Power Resources for Wake
 
 	// Leave USB ports on for to allow Wake from USB