From 411898dc87c09d0cd103a4243c8cb4a72b115c51 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Wed, 18 Oct 2017 18:21:00 -0700 Subject: [PATCH] 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 --- .../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 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 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-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}) -- 2.39.2