From b6427b0b1833e90b1f4d3546da4dcebb5aa563d4 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Tue, 7 Jul 2020 01:29:40 +0200 Subject: [PATCH] sb/intel: Factor out ICH ACPI for HDA Files are identical between all three southbridges, and differ for PCH. Change-Id: Ic6a926af675bda3db3a5795df9e8f490caf3ebf4 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/43156 Reviewed-by: Arthur Heymans Reviewed-by: Paul Menzel Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- .../acpi/audio.asl => common/acpi/audio_ich.asl} | 0 src/southbridge/intel/i82801gx/acpi/ich7.asl | 2 +- src/southbridge/intel/i82801ix/acpi/audio.asl | 16 ---------------- src/southbridge/intel/i82801ix/acpi/ich9.asl | 2 +- src/southbridge/intel/i82801jx/acpi/audio.asl | 16 ---------------- src/southbridge/intel/i82801jx/acpi/ich10.asl | 2 +- 6 files changed, 3 insertions(+), 35 deletions(-) rename src/southbridge/intel/{i82801gx/acpi/audio.asl => common/acpi/audio_ich.asl} (100%) delete mode 100644 src/southbridge/intel/i82801ix/acpi/audio.asl delete mode 100644 src/southbridge/intel/i82801jx/acpi/audio.asl diff --git a/src/southbridge/intel/i82801gx/acpi/audio.asl b/src/southbridge/intel/common/acpi/audio_ich.asl similarity index 100% rename from src/southbridge/intel/i82801gx/acpi/audio.asl rename to src/southbridge/intel/common/acpi/audio_ich.asl diff --git a/src/southbridge/intel/i82801gx/acpi/ich7.asl b/src/southbridge/intel/i82801gx/acpi/ich7.asl index 08af0a9c36..4d077205a3 100644 --- a/src/southbridge/intel/i82801gx/acpi/ich7.asl +++ b/src/southbridge/intel/i82801gx/acpi/ich7.asl @@ -148,7 +148,7 @@ Scope(\) } // 0:1b.0 High Definition Audio (Azalia) -#include "audio.asl" +#include // PCI Express Ports #include diff --git a/src/southbridge/intel/i82801ix/acpi/audio.asl b/src/southbridge/intel/i82801ix/acpi/audio.asl deleted file mode 100644 index b9c256c644..0000000000 --- a/src/southbridge/intel/i82801ix/acpi/audio.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel ICH HDA */ - -// Intel High Definition Audio (Azalia) 0:1b.0 - -Device (HDEF) -{ - Name (_ADR, 0x001b0000) - - // Power Resources for Wake - Name (_PRW, Package(){ - 5, // Bit 5 of GPE - 4 // Can wake from S4 state. - }) -} diff --git a/src/southbridge/intel/i82801ix/acpi/ich9.asl b/src/southbridge/intel/i82801ix/acpi/ich9.asl index 115c2543d4..25a756e87f 100644 --- a/src/southbridge/intel/i82801ix/acpi/ich9.asl +++ b/src/southbridge/intel/i82801ix/acpi/ich9.asl @@ -151,7 +151,7 @@ Scope(\) } // 0:1b.0 High Definition Audio (Azalia) -#include "audio.asl" +#include // PCI Express Ports #include diff --git a/src/southbridge/intel/i82801jx/acpi/audio.asl b/src/southbridge/intel/i82801jx/acpi/audio.asl deleted file mode 100644 index b9c256c644..0000000000 --- a/src/southbridge/intel/i82801jx/acpi/audio.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -/* Intel ICH HDA */ - -// Intel High Definition Audio (Azalia) 0:1b.0 - -Device (HDEF) -{ - Name (_ADR, 0x001b0000) - - // Power Resources for Wake - Name (_PRW, Package(){ - 5, // Bit 5 of GPE - 4 // Can wake from S4 state. - }) -} diff --git a/src/southbridge/intel/i82801jx/acpi/ich10.asl b/src/southbridge/intel/i82801jx/acpi/ich10.asl index a79b8a3d26..e62f8a1a80 100644 --- a/src/southbridge/intel/i82801jx/acpi/ich10.asl +++ b/src/southbridge/intel/i82801jx/acpi/ich10.asl @@ -152,7 +152,7 @@ Scope(\) } // 0:1b.0 High Definition Audio (Azalia) -#include "audio.asl" +#include // PCI Express Ports #include