Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46268 )
Change subject: soc/intel/common/block/acpi: Factor out common buttons.asl ......................................................................
soc/intel/common/block/acpi: Factor out common buttons.asl
This patch moves mainboard.asl into common block acpi directory and renams as buttons.asl to make it meaningful in purpose and avoid duplicating the same ASL code block across mainboard directory.
TEST=Able to build and boot TGLRVP platform. 1) Dump and disassemble DSDT, verify PWRB device present inside common buttons.asl is still there. 2) Verify no ACPI error seen while running 'dmesg` from console.
Change-Id: I8f9d73048041d42d809750fdb52092f40ab8f11f Signed-off-by: Subrata Banik subrata.banik@intel.com --- D src/mainboard/intel/icelake_rvp/acpi/mainboard.asl M src/mainboard/intel/icelake_rvp/dsdt.asl D src/mainboard/intel/jasperlake_rvp/acpi/mainboard.asl M src/mainboard/intel/jasperlake_rvp/dsdt.asl D src/mainboard/intel/kblrvp/acpi/mainboard.asl M src/mainboard/intel/kblrvp/dsdt.asl M src/mainboard/intel/kunimitsu/dsdt.asl D src/mainboard/intel/tglrvp/acpi/mainboard.asl M src/mainboard/intel/tglrvp/dsdt.asl R src/soc/intel/common/block/acpi/acpi/buttons.asl 10 files changed, 8 insertions(+), 59 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/46268/1
diff --git a/src/mainboard/intel/icelake_rvp/acpi/mainboard.asl b/src/mainboard/intel/icelake_rvp/acpi/mainboard.asl deleted file mode 100644 index 4670015..0000000 --- a/src/mainboard/intel/icelake_rvp/acpi/mainboard.asl +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#if CONFIG(EC_GOOGLE_CHROMEEC) -Scope (_SB) -{ - Device (PWRB) - { - Name (_HID, EisaId ("PNP0C0C")) - } -} -#endif diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl index 41a9c0a..6d6749e 100644 --- a/src/mainboard/intel/icelake_rvp/dsdt.asl +++ b/src/mainboard/intel/icelake_rvp/dsdt.asl @@ -43,11 +43,8 @@ /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> } + #include <soc/intel/common/block/acpi/acpi/buttons.asl> #endif
#include <southbridge/intel/common/acpi/sleepstates.asl> - - // Mainboard specific - #include "acpi/mainboard.asl" - } diff --git a/src/mainboard/intel/jasperlake_rvp/acpi/mainboard.asl b/src/mainboard/intel/jasperlake_rvp/acpi/mainboard.asl deleted file mode 100644 index 4670015..0000000 --- a/src/mainboard/intel/jasperlake_rvp/acpi/mainboard.asl +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#if CONFIG(EC_GOOGLE_CHROMEEC) -Scope (_SB) -{ - Device (PWRB) - { - Name (_HID, EisaId ("PNP0C0C")) - } -} -#endif diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl index ce781e2..83bfe50 100644 --- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl +++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl @@ -43,11 +43,8 @@ /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> } + #include <soc/intel/common/block/acpi/acpi/buttons.asl> #endif
#include <southbridge/intel/common/acpi/sleepstates.asl> - - /* Mainboard specific */ - #include "acpi/mainboard.asl" - } diff --git a/src/mainboard/intel/kblrvp/acpi/mainboard.asl b/src/mainboard/intel/kblrvp/acpi/mainboard.asl deleted file mode 100644 index 4670015..0000000 --- a/src/mainboard/intel/kblrvp/acpi/mainboard.asl +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#if CONFIG(EC_GOOGLE_CHROMEEC) -Scope (_SB) -{ - Device (PWRB) - { - Name (_HID, EisaId ("PNP0C0C")) - } -} -#endif diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl index 6eee06a..5fead4e 100644 --- a/src/mainboard/intel/kblrvp/dsdt.asl +++ b/src/mainboard/intel/kblrvp/dsdt.asl @@ -40,8 +40,9 @@ #include <vendorcode/google/chromeos/acpi/chromeos.asl> #endif
- #include <southbridge/intel/common/acpi/sleepstates.asl> +#if CONFIG(EC_GOOGLE_CHROMEEC) + #include <soc/intel/common/block/acpi/acpi/buttons.asl> +#endif
- // Mainboard specific - #include "acpi/mainboard.asl" + #include <southbridge/intel/common/acpi/sleepstates.asl> } diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl index 7159577..4098f4f 100644 --- a/src/mainboard/intel/kunimitsu/dsdt.asl +++ b/src/mainboard/intel/kunimitsu/dsdt.asl @@ -35,5 +35,5 @@ #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific - #include "acpi/mainboard.asl" + #include <soc/intel/common/block/acpi/acpi/buttons.asl> } diff --git a/src/mainboard/intel/tglrvp/acpi/mainboard.asl b/src/mainboard/intel/tglrvp/acpi/mainboard.asl deleted file mode 100644 index 4670015..0000000 --- a/src/mainboard/intel/tglrvp/acpi/mainboard.asl +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#if CONFIG(EC_GOOGLE_CHROMEEC) -Scope (_SB) -{ - Device (PWRB) - { - Name (_HID, EisaId ("PNP0C0C")) - } -} -#endif diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl index 5cde1de..e98ae68 100644 --- a/src/mainboard/intel/tglrvp/dsdt.asl +++ b/src/mainboard/intel/tglrvp/dsdt.asl @@ -45,13 +45,11 @@ /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> } + #include <soc/intel/common/block/acpi/acpi/buttons.asl> #endif
#include <southbridge/intel/common/acpi/sleepstates.asl>
- /* Mainboard specific */ - #include "acpi/mainboard.asl" - /* Camera */ #include "acpi/mipi_camera.asl" } diff --git a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl b/src/soc/intel/common/block/acpi/acpi/buttons.asl similarity index 100% rename from src/mainboard/intel/kunimitsu/acpi/mainboard.asl rename to src/soc/intel/common/block/acpi/acpi/buttons.asl