This header relates to ACPI and we are about to add some more ACPI headers. Move this one into a new directory so they are together.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com ---
Changes in v4: None Changes in v3: - Add new patch to move acpi_s3.h to include/acpi/
Changes in v2: None
arch/x86/cpu/apollolake/cpu_spl.c | 2 +- arch/x86/cpu/apollolake/fsp_s.c | 2 +- arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/baytrail/acpi.c | 4 ++-- arch/x86/cpu/cpu.c | 2 +- arch/x86/cpu/wakeup.S | 2 +- arch/x86/lib/acpi_s3.c | 2 +- arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/fsp/fsp_common.c | 2 +- arch/x86/lib/fsp1/fsp_common.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 2 +- drivers/pci/pci_rom.c | 4 +--- drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 +- drivers/sysreset/sysreset_x86.c | 2 +- include/{ => acpi}/acpi_s3.h | 0 15 files changed, 15 insertions(+), 17 deletions(-) rename include/{ => acpi}/acpi_s3.h (100%)
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c index 8a39c3128e0..e2509e391fa 100644 --- a/arch/x86/cpu/apollolake/cpu_spl.c +++ b/arch/x86/cpu/apollolake/cpu_spl.c @@ -6,13 +6,13 @@ */
#include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <ec_commands.h> #include <log.h> #include <spi_flash.h> #include <spl.h> #include <syscon.h> +#include <acpi/acpi_s3.h> #include <asm/cpu.h> #include <asm/cpu_common.h> #include <asm/cpu_x86.h> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index 1f22c1ea3c6..17cf1682ad0 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -5,11 +5,11 @@ */
#include <common.h> -#include <acpi_s3.h> #include <binman.h> #include <dm.h> #include <irq.h> #include <malloc.h> +#include <acpi/acpi_s3.h> #include <asm/intel_pinctrl.h> #include <asm/io.h> #include <asm/intel_regs.h> diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index aec0c8394c2..4ea7c7447bc 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -9,10 +9,10 @@ #define LOG_CATEGORY UCLASS_ACPI_PMC
#include <common.h> -#include <acpi_s3.h> #include <dt-structs.h> #include <dm.h> #include <spl.h> +#include <acpi/acpi_s3.h> #include <asm/io.h> #include <asm/pci.h> #include <power/acpi_pmc.h> diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index f44228e6939..3c27391873c 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -4,15 +4,15 @@ */
#include <common.h> -#include <acpi_s3.h> #include <cpu.h> #include <dm.h> -#include <dm/uclass-internal.h> +#include <acpi/acpi_s3.h> #include <asm/acpi_table.h> #include <asm/io.h> #include <asm/tables.h> #include <asm/arch/global_nvs.h> #include <asm/arch/iomap.h> +#include <dm/uclass-internal.h>
void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs, void *dsdt) diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index dae06949cc6..246ee50948c 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -19,7 +19,6 @@ */
#include <common.h> -#include <acpi_s3.h> #include <command.h> #include <cpu_func.h> #include <dm.h> @@ -27,6 +26,7 @@ #include <init.h> #include <malloc.h> #include <syscon.h> +#include <acpi/acpi_s3.h> #include <asm/acpi.h> #include <asm/acpi_table.h> #include <asm/control_regs.h> diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S index 244ca1276af..093bf3bcc5c 100644 --- a/arch/x86/cpu/wakeup.S +++ b/arch/x86/cpu/wakeup.S @@ -5,7 +5,7 @@ * From coreboot src/arch/x86/wakeup.S */
-#include <acpi_s3.h> +#include <acpi/acpi_s3.h> #include <asm/processor.h> #include <asm/processor-flags.h>
diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 197636c4b50..c3759ec8492 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.c @@ -4,7 +4,7 @@ */
#include <common.h> -#include <acpi_s3.h> +#include <acpi/acpi_s3.h> #include <asm/acpi.h> #include <asm/acpi_table.h> #include <asm/post.h> diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 2943e11d2a4..c996fc588df 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -4,9 +4,9 @@ */
#include <common.h> -#include <acpi_s3.h> #include <malloc.h> #include <vbe.h> +#include <acpi/acpi_s3.h> #include <asm/coreboot_tables.h> #include <asm/e820.h>
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 5eff0f99aad..267527eb344 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -4,11 +4,11 @@ */
#include <common.h> -#include <acpi_s3.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> #include <rtc.h> +#include <acpi/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> #include <asm/io.h> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index aee2a05044f..0a726807c2b 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -4,11 +4,11 @@ */
#include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <errno.h> #include <malloc.h> #include <rtc.h> +#include <acpi/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> #include <asm/io.h> diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c index 90a238a2245..c8f2c09b6a7 100644 --- a/arch/x86/lib/fsp2/fsp_dram.c +++ b/arch/x86/lib/fsp2/fsp_dram.c @@ -5,9 +5,9 @@ */
#include <common.h> -#include <acpi_s3.h> #include <handoff.h> #include <spl.h> +#include <acpi/acpi_s3.h> #include <asm/arch/cpu.h> #include <asm/fsp/fsp_support.h> #include <asm/fsp2/fsp_api.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 90f224b0452..6b17f18bc07 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -33,12 +33,10 @@ #include <vbe.h> #include <video.h> #include <video_fb.h> +#include <acpi/acpi_s3.h> #include <linux/screen_info.h>
-#ifdef CONFIG_X86 -#include <acpi_s3.h> DECLARE_GLOBAL_DATA_PTR; -#endif
__weak bool board_should_run_oprom(struct udevice *dev) { diff --git a/drivers/power/acpi_pmc/acpi-pmc-uclass.c b/drivers/power/acpi_pmc/acpi-pmc-uclass.c index d43de87126c..1c79f835c66 100644 --- a/drivers/power/acpi_pmc/acpi-pmc-uclass.c +++ b/drivers/power/acpi_pmc/acpi-pmc-uclass.c @@ -6,9 +6,9 @@ #define LOG_CATEGORY UCLASS_ACPI_PMC
#include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <log.h> +#include <acpi/acpi_s3.h> #ifdef CONFIG_X86 #include <asm/intel_pinctrl.h> #endif diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 8e2d1eaa7a1..bc911435602 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -6,11 +6,11 @@ */
#include <common.h> -#include <acpi_s3.h> #include <dm.h> #include <efi_loader.h> #include <pch.h> #include <sysreset.h> +#include <acpi/acpi_s3.h> #include <asm/io.h> #include <asm/processor.h>
diff --git a/include/acpi_s3.h b/include/acpi/acpi_s3.h similarity index 100% rename from include/acpi_s3.h rename to include/acpi/acpi_s3.h