Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46954 )
Change subject: soc/intel/broadwell/pch/acpi: Borrow Lynxpoint ACPI ......................................................................
soc/intel/broadwell/pch/acpi: Borrow Lynxpoint ACPI
Tested with BUILD_TIMELESS=1, Purism Librem 13 v1 remains identical.
Change-Id: Iec9a07d27a95f204fb239a11d07fe2ad342621c9 Signed-off-by: Angel Pons th3fanbus@gmail.com --- D src/soc/intel/broadwell/pch/acpi/audio.asl D src/soc/intel/broadwell/pch/acpi/ehci.asl M src/soc/intel/broadwell/pch/acpi/pch.asl D src/soc/intel/broadwell/pch/acpi/sata.asl 4 files changed, 5 insertions(+), 54 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/46954/1
diff --git a/src/soc/intel/broadwell/pch/acpi/audio.asl b/src/soc/intel/broadwell/pch/acpi/audio.asl deleted file mode 100644 index a6f0d7b..0000000 --- a/src/soc/intel/broadwell/pch/acpi/audio.asl +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel PCH HDA */ - -// Intel High Definition Audio (Azalia) 0:1b.0 - -Device (HDEF) -{ - Name (_ADR, 0x001b0000) - Name (_PRW, Package () { 0x6d, 3 }) -} diff --git a/src/soc/intel/broadwell/pch/acpi/ehci.asl b/src/soc/intel/broadwell/pch/acpi/ehci.asl deleted file mode 100644 index 632b19f..0000000 --- a/src/soc/intel/broadwell/pch/acpi/ehci.asl +++ /dev/null @@ -1,33 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// EHCI Controller 0:1d.0 - -Device (EHCI) -{ - Name (_ADR, 0x001d0000) - Name (_PRW, Package(){ 0x6d, 3 }) - - // Leave USB ports on for to allow Wake from USB - - Method (_S3D, 0) // Highest D State in S3 State - { - Return (2) - } - - Method (_S4D, 0) // Highest D State in S4 State - { - Return (2) - } - - Device (HUB7) - { - Name (_ADR, 0) - - Device (PRT1) { Name (_ADR, 1) } // USB Port 0 - Device (PRT2) { Name (_ADR, 2) } // USB Port 1 - Device (PRT3) { Name (_ADR, 3) } // USB Port 2 - Device (PRT4) { Name (_ADR, 4) } // USB Port 3 - Device (PRT5) { Name (_ADR, 5) } // USB Port 4 - Device (PRT6) { Name (_ADR, 6) } // USB Port 5 - } -} diff --git a/src/soc/intel/broadwell/pch/acpi/pch.asl b/src/soc/intel/broadwell/pch/acpi/pch.asl index d08d955..c7c6207 100644 --- a/src/soc/intel/broadwell/pch/acpi/pch.asl +++ b/src/soc/intel/broadwell/pch/acpi/pch.asl @@ -2,6 +2,8 @@
#include <soc/intel/broadwell/memmap.h>
+#define DEFAULT_PRW_VALUE 0x6d + Scope () { // IO-Trap at 0x800. This is the ACPI->SMI communication interface. @@ -39,7 +41,7 @@ }
// High Definition Audio (Azalia) 0:1b.0 -#include "audio.asl" +#include <southbridge/intel/lynxpoint/acpi/audio.asl>
// ADSP/SST 0:13.0 #include "adsp.asl" @@ -48,7 +50,7 @@ #include <southbridge/intel/common/acpi/pcie.asl>
// USB EHCI 0:1d.0 -#include "ehci.asl" +#include <southbridge/intel/lynxpoint/acpi/ehci.asl>
// USB XHCI 0:14.0 #include "xhci.asl" @@ -57,7 +59,7 @@ #include "lpc.asl"
// SATA 0:1f.2 -#include "sata.asl" +#include <southbridge/intel/lynxpoint/acpi/sata.asl>
// SMBus 0:1f.3 #include <southbridge/intel/common/acpi/smbus.asl> diff --git a/src/soc/intel/broadwell/pch/acpi/sata.asl b/src/soc/intel/broadwell/pch/acpi/sata.asl deleted file mode 100644 index cdb6e52..0000000 --- a/src/soc/intel/broadwell/pch/acpi/sata.asl +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -// Intel SATA Controller 0:1f.2 -Device (SATA) -{ - Name (_ADR, 0x001f0002) -}