| Message ID | 1508376060-29425-9-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | [U-Boot,1/9] x86: galileo: Fix boot failure | expand |
On 19 October 2017 at 03:21, Bin Meng <bmeng.cn@gmail.com> wrote: > The supported sleep states are generic on Intel processors. Move the > ASL definition to the common place. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl | 0 > arch/x86/include/asm/arch-baytrail/acpi/platform.asl | 2 +- > arch/x86/include/asm/arch-quark/acpi/platform.asl | 2 +- > arch/x86/include/asm/arch-quark/acpi/sleepstates.asl | 10 ---------- > 4 files changed, 2 insertions(+), 12 deletions(-) > rename arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl (100%) > delete mode 100644 arch/x86/include/asm/arch-quark/acpi/sleepstates.asl Reviewed-by: Simon Glass <sjg@chromium.org>
On Sun, Oct 22, 2017 at 10:36 PM, Simon Glass <sjg@chromium.org> wrote: > On 19 October 2017 at 03:21, Bin Meng <bmeng.cn@gmail.com> wrote: >> The supported sleep states are generic on Intel processors. Move the >> ASL definition to the common place. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl | 0 >> arch/x86/include/asm/arch-baytrail/acpi/platform.asl | 2 +- >> arch/x86/include/asm/arch-quark/acpi/platform.asl | 2 +- >> arch/x86/include/asm/arch-quark/acpi/sleepstates.asl | 10 ---------- >> 4 files changed, 2 insertions(+), 12 deletions(-) >> rename arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl (100%) >> delete mode 100644 arch/x86/include/asm/arch-quark/acpi/sleepstates.asl > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl b/arch/x86/include/asm/acpi/sleepstates.asl similarity index 100% rename from arch/x86/include/asm/arch-baytrail/acpi/sleepstates.asl rename to arch/x86/include/asm/acpi/sleepstates.asl diff --git a/arch/x86/include/asm/arch-baytrail/acpi/platform.asl b/arch/x86/include/asm/arch-baytrail/acpi/platform.asl index a80d2c0..cf3de7c 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 <asm/acpi/sleepstates.asl> diff --git a/arch/x86/include/asm/arch-quark/acpi/platform.asl b/arch/x86/include/asm/arch-quark/acpi/platform.asl index 1ecf153..db59c46 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 <asm/acpi/sleepstates.asl> 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 63c82fa..0000000 --- a/arch/x86/include/asm/arch-quark/acpi/sleepstates.asl +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com> - * - * 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})
The supported sleep states are generic on Intel processors. Move the ASL definition to the common place. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl | 0 arch/x86/include/asm/arch-baytrail/acpi/platform.asl | 2 +- arch/x86/include/asm/arch-quark/acpi/platform.asl | 2 +- arch/x86/include/asm/arch-quark/acpi/sleepstates.asl | 10 ---------- 4 files changed, 2 insertions(+), 12 deletions(-) rename arch/x86/include/asm/{arch-baytrail => }/acpi/sleepstates.asl (100%) delete mode 100644 arch/x86/include/asm/arch-quark/acpi/sleepstates.asl