From: Bin Meng Date: Thu, 19 Oct 2017 01:21:00 +0000 (-0700) Subject: x86: acpi: Put sleepstates.asl to the common place X-Git-Tag: v2017.11-rc3~23^2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=411898dc87c09d0cd103a4243c8cb4a72b115c51;p=oweals%2Fu-boot.git x86: acpi: Put sleepstates.asl to the common place The supported sleep states are generic on Intel processors. Move the ASL definition to the common place. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- diff --git a/arch/x86/include/asm/acpi/sleepstates.asl b/arch/x86/include/asm/acpi/sleepstates.asl new file mode 100644 index 0000000000..5600723084 --- /dev/null +++ b/arch/x86/include/asm/acpi/sleepstates.asl @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2007-2009 coresystems GmbH + * Copyright (C) 2016 Bin Meng + * + * Modified from coreboot src/soc/intel/baytrail/acpi/sleepstates.asl + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0}) +#ifdef CONFIG_HAVE_ACPI_RESUME +Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0}) +#endif +Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0}) +Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0}) diff --git a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl index a80d2c0e51..cf3de7cde4 100644 --- a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl +++ b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl @@ -36,4 +36,4 @@ Scope (\_SB) } /* Chipset specific sleep states */ -#include "sleepstates.asl" +#include diff --git a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl deleted file mode 100644 index 5600723084..0000000000 --- a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2007-2009 coresystems GmbH - * Copyright (C) 2016 Bin Meng - * - * Modified from coreboot src/soc/intel/baytrail/acpi/sleepstates.asl - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0}) -#ifdef CONFIG_HAVE_ACPI_RESUME -Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0}) -#endif -Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0}) -Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0}) diff --git a/arch/x86/include/asm/arch-quark/acpi/platform.asl b/arch/x86/include/asm/arch-quark/acpi/platform.asl index 1ecf153c0f..db59c460e3 100644 --- a/arch/x86/include/asm/arch-quark/acpi/platform.asl +++ b/arch/x86/include/asm/arch-quark/acpi/platform.asl @@ -33,4 +33,4 @@ Scope (\_SB) } /* Chipset specific sleep states */ -#include "sleepstates.asl" +#include diff --git a/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl b/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl deleted file mode 100644 index 63c82fa123..0000000000 --- a/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (C) 2016, Bin Meng - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -Name(\_S0, Package() {0x0, 0x0, 0x0, 0x0}) -Name(\_S3, Package() {0x5, 0x0, 0x0, 0x0}) -Name(\_S4, Package() {0x6, 0x0, 0x0, 0x0}) -Name(\_S5, Package() {0x7, 0x0, 0x0, 0x0})