From 66eb6d241cf6d5fc92520a6fc9c8c40f51192ffe Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 22 May 2013 09:51:11 -0700 Subject: [PATCH] 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. BUG=chrome-os-partner:19035 BRANCH=none TEST=manual: 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 Reviewed-on: https://gerrit.chromium.org/gerrit/56263 Reviewed-by: Aaron Durbin --- 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 cf3e6a049f..5c1f6a57a5 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