acpi: Move ACPI table support out of arch/x86 (3/5)

This change moves all ACPI table support in coreboot currently living
under arch/x86 into common code to make it architecture
independent. ACPI table generation is not really tied to any
architecture and hence it makes sense to move this to its own
directory.

In order to make it easier to review, this change is being split into
multiple CLs. This is change 3/5 which basically is generated by
running the following command:
$ git grep -iIl "arch/acpi" | xargs sed -i 's/arch\/acpi/acpi\/acpi/g'

BUG=b:155428745

Change-Id: I16b1c45d954d6440fb9db1d3710063a47b582eae
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40938
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>

Documentation/Intel/SoC/soc.html

@@ -657,7 +657,7 @@ Use the following steps to debug the call to TempRamInit:
   The EDK2 data structure is defined in
   MdeModulePkg/Include/IndustryStandard/<a target="_blank" href="https://github.com/tianocore/edk2/blob/master/MdePkg/Include/IndustryStandard/Acpi61.h#l111">Acpi61.h</a>
   The coreboot data structure is defined in
-  src/arch/x86/include/arch/<a target="_blank" href="https://review.coreboot.org/gitweb?p=coreboot.git;a=blob;f=src/arch/x86/include/arch/acpi.h;hb=HEAD#l237">acpi.h</a>
+  src/arch/x86/include/arch/<a target="_blank" href="https://review.coreboot.org/gitweb?p=coreboot.git;a=blob;f=src/arch/x86/include/acpi/acpi.h;hb=HEAD#l237">acpi.h</a>
 </p>
 
 <ol>

Documentation/acpi/devicetree.md

@@ -157,7 +157,7 @@ Note that the ACPI_IRQ_WAKE_EDGE_LOW macro informs the platform that the GPIO
 will be routed through SCI (ACPI's System Control Interrupt) for use as a wake
 source.  Also note that the IRQ names are SoC-specific, and you will need to
 find the names in your SoC's header file.  The ACPI_* macros are defined in
-``src/arch/x86/include/arch/acpi_device.h``.
+``src/arch/x86/include/acpi/acpi_device.h``.
 
 Using a GPIO as an IRQ requires that it is configured in coreboot correctly.
 This is often done in a mainboard-specific file named ``gpio.c``.

src/acpi/acpi.c

@@ -16,9 +16,9 @@
 
 #include <console/console.h>
 #include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_ivrs.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_ivrs.h>
+#include <acpi/acpigen.h>
 #include <device/pci.h>
 #include <cbmem.h>
 #include <commonlib/helpers.h>

src/acpi/acpi_device.c

@@ -3,9 +3,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <stdlib.h>

src/acpi/acpi_pld.c

@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <arch/acpi.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_pld.h>
 
 int acpi_pld_fill_usb(struct acpi_pld *pld, enum acpi_upc_type type,
 		      struct acpi_pld_group *group)

src/acpi/acpigen.c

@@ -13,7 +13,7 @@
 
 #include <lib.h>
 #include <string.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <assert.h>
 #include <console/console.h>
 #include <device/device.h>

src/acpi/acpigen_dsm.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpigen.h>
-#include <arch/acpigen_dsm.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_dsm.h>
 
 /* -------------------  I2C HID DSM ---------------------------- */
 

src/acpi/acpigen_ps2_keybd.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
-#include <arch/acpigen_ps2_keybd.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_ps2_keybd.h>
 #include <console/console.h>
 #include <input-event-codes.h>
 

src/acpi/sata.c

@@ -3,8 +3,8 @@
 
 #include "sata.h"
 
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 
 /* e.g.
  * generate_sata_ssdt_ports("\_SB.PCI0.SATA", 0x3);

src/arch/x86/acpi/debug.asl

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 /*
-	#include <arch/acpi.h>
+	#include <acpi/acpi.h>
 	DefinitionBlock (
 		"DSDT.AML",
 		"DSDT",

src/arch/x86/acpi_bert_storage.c

@@ -7,7 +7,7 @@
 #include <cpu/x86/name.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/lapic.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/bert_storage.h>
 #include <string.h>
 

src/arch/x86/acpi_s3.c

@@ -3,7 +3,7 @@
 
 #include <console/console.h>
 #include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/cpu.h>
 #include <cbmem.h>
 #include <commonlib/helpers.h>

src/arch/x86/ebda.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/ebda.h>
 #include <commonlib/endian.h>
 #include <console/console.h>

src/arch/x86/include/arch/bert_storage.h

@@ -5,7 +5,7 @@
 #define _BERT_STORAGE_H_
 
 #include <stdint.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 
 /* Items in the BERT region
  *

src/arch/x86/tables.c

@@ -8,7 +8,7 @@
 #include <boot/coreboot_tables.h>
 #include <arch/pirq_routing.h>
 #include <arch/smp/mpspec.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <commonlib/helpers.h>
 #include <string.h>
 #include <cbmem.h>

src/cpu/amd/agesa/family14/model_14_init.c

@@ -11,7 +11,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 
 static void model_14_init(struct device *dev)

src/cpu/amd/agesa/family15tn/model_15_init.c

@@ -12,7 +12,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 
 static void model_15_init(struct device *dev)

src/cpu/amd/agesa/family16kb/model_16_init.c

@@ -11,7 +11,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/cache.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 
 static void model_16_init(struct device *dev)

src/cpu/intel/common/common_init.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>

src/cpu/intel/haswell/acpi.c

@@ -3,8 +3,8 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>

src/cpu/intel/haswell/haswell_init.c

@@ -3,7 +3,7 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/cpu/intel/model_2065x/acpi.c

@@ -3,8 +3,8 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>

src/cpu/intel/model_2065x/model_2065x_init.c

@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/cpu/intel/model_206ax/acpi.c

@@ -3,8 +3,8 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/speedstep.h>

src/cpu/intel/model_206ax/model_206ax_init.c

@@ -3,7 +3,7 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/cpu.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>

src/cpu/intel/speedstep/acpi.c

@@ -3,8 +3,8 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <cpu/x86/msr.h>
 #include <cpu/intel/fsb.h>

src/cpu/x86/backup_default_smm.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <cbmem.h>
 #include <cpu/x86/smm.h>

src/cpu/x86/lapic/lapic_cpu_init.c

@@ -5,7 +5,7 @@
 #include <cpu/x86/gdt.h>
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/smi_deprecated.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <delay.h>
 #include <halt.h>
 #include <lib.h>

src/device/pci_device.c

@@ -6,7 +6,7 @@
  * PCI Bus Services, see include/linux/pci.h for further explanation.
  */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <device/pci_ops.h>
 #include <bootmode.h>
 #include <console/console.h>

src/device/pci_rom.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <cbfs.h>
 #include <cbmem.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 
 /* Rmodules don't like weak symbols. */
 void __weak map_oprom_vendev_rev(u32 *vendev, u8 *rev) { return; }

src/drivers/amd/agesa/heapmanager.c

@@ -9,7 +9,7 @@
 #include <northbridge/amd/agesa/agesa_helper.h>
 #include <northbridge/amd/agesa/BiosCallOuts.h>
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <string.h>
 

src/drivers/amd/agesa/romstage.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <amdblocks/biosram.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/cpu.h>
 #include <arch/romstage.h>
 #include <cbmem.h>

src/drivers/amd/agesa/state_machine.c

@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <bootstate.h>
 #include <cbfs.h>
 #include <cbmem.h>

src/drivers/crb/tis.c

@@ -3,7 +3,7 @@
 
 #include <console/console.h>
 #include <security/tpm/tis.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <device/device.h>
 #include <drivers/intel/ptt/ptt.h>
 

src/drivers/elog/elog.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #endif
 #include <bootstate.h>
 #include <cbmem.h>

src/drivers/generic/adau7002/adau7002.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/drivers/generic/bayhub/chip.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 /*
  * Bayhub BG720 PCI to eMMC bridge

src/drivers/generic/generic/chip.h

@@ -6,7 +6,7 @@
 
 #if CONFIG(HAVE_ACPI_TABLES)
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 #define MAX_GENERIC_PROPERTY_LIST 10
 

src/drivers/generic/generic/generic.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/drivers/generic/gpio_keys/chip.h

@@ -4,7 +4,7 @@
 #ifndef __DRIVERS_GENERIC_GPIO_KEYS_H__
 #define __DRIVERS_GENERIC_GPIO_KEYS_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 #include <stdint.h>
 
 /* Linux input type */

src/drivers/generic/gpio_keys/gpio_keys.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <string.h>

src/drivers/generic/gpio_regulator/chip.h

@@ -4,7 +4,7 @@
 #ifndef __DRIVERS_GENERIC_GPIO_REGULATOR_H__
 #define __DRIVERS_GENERIC_GPIO_REGULATOR_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 struct drivers_generic_gpio_regulator_config {
 	const char *name;

src/drivers/generic/gpio_regulator/gpio_regulator.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <device/device.h>
 #include <device/path.h>
 #include <string.h>

src/drivers/generic/max98357a/chip.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 struct drivers_generic_max98357a_config {
 

src/drivers/generic/max98357a/max98357a.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/drivers/gfx/generic/chip.h

@@ -4,7 +4,7 @@
 #ifndef __DRIVERS_GFX_GENERIC_CHIP_H__
 #define __DRIVERS_GFX_GENERIC_CHIP_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 /* Config for electronic privacy screen */
 struct drivers_gfx_generic_privacy_screen_config {

src/drivers/gfx/generic/generic.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>

src/drivers/i2c/da7219/chip.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 /*
  * Dialog Semiconductor DA7219 Audio Codec devicetree bindings

src/drivers/i2c/da7219/da7219.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/designware/dw_i2c.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>

src/drivers/i2c/generic/chip.h

@@ -4,7 +4,7 @@
 #ifndef __I2C_GENERIC_CHIP_H__
 #define __I2C_GENERIC_CHIP_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 #include <device/i2c_simple.h>
 
 #define MAX_GENERIC_PROPERTY_LIST 10

src/drivers/i2c/generic/generic.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/hid/hid.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpigen_dsm.h>
+#include <acpi/acpigen_dsm.h>
 #include <device/device.h>
 #include <stdint.h>
 #include <string.h>

src/drivers/i2c/max98373/max98373.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/max98927/max98927.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/nau8825/chip.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 #define NAU8825_MAX_BUTTONS 8
 

src/drivers/i2c/nau8825/nau8825.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/rt1011/rt1011.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c.h>
 #include <device/device.h>

src/drivers/i2c/rt5663/chip.h

@@ -5,7 +5,7 @@
  * Realtek RT5663 audio codec devicetree bindings
  */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 #include <stdint.h>
 
 struct drivers_i2c_rt5663_config {

src/drivers/i2c/rt5663/rt5663.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c.h>
 #include <device/device.h>

src/drivers/i2c/sx9310/chip.h

@@ -4,7 +4,7 @@
 #ifndef __DRIVERS_I2C_SX9310_CHIP_H__
 #define __DRIVERS_I2C_SX9310_CHIP_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 #include <device/i2c_simple.h>
 
 #define REGISTER(NAME) uint8_t NAME

src/drivers/i2c/sx9310/sx9310.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/tpm/chip.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/i2c/tpm/chip.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 #include <device/i2c_simple.h>
 
 struct drivers_i2c_tpm_config {

src/drivers/intel/fsp1_1/raminit.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <cbmem.h>
 #include <cf9_reset.h>
 #include <commonlib/helpers.h>

src/drivers/intel/fsp1_1/ramstage.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <bootmode.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <fsp/ramstage.h>

src/drivers/intel/fsp1_1/romstage.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <stddef.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <assert.h>
 #include <console/console.h>
 #include <cbmem.h>

src/drivers/intel/gma/acpi.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <string.h>
 #include "i915.h"
 

src/drivers/intel/gma/intel_ddi.c

@@ -30,7 +30,7 @@
 #include <device/device.h>
 #include <device/pci_def.h>
 #include <console/console.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <device/pci.h>
 #include <ec/google/chromeec/ec.h>
 #include <cpu/x86/tsc.h>

src/drivers/intel/gma/opregion.c

@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <types.h>
 #include <string.h>
 #include <cbfs.h>

src/drivers/intel/ish/ish.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>

src/drivers/intel/mipi_camera/camera.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/i2c_simple.h>
 #include <device/device.h>

src/drivers/ipmi/ipmi_kcs_ops.c

@@ -13,8 +13,8 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #endif
 #if CONFIG(GENERATE_SMBIOS_TABLES)
 #include <smbios.h>

src/drivers/lenovo/wacom.c

@@ -14,8 +14,8 @@
 
 #include <types.h>
 #include <console/console.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
 #include <device/device.h>
 #include <device/pnp.h>
 #include <string.h>

src/drivers/net/chip.h

@@ -5,7 +5,7 @@
 #define __DRIVERS_R8168_CHIP_H__
 
 #include <stdint.h>
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 struct drivers_net_config {
 	uint16_t customized_leds;

src/drivers/net/r8168.c

@@ -9,8 +9,8 @@
  */
 
 #include <cbfs.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <string.h>
 #include <arch/io.h>
 #include <console/console.h>

src/drivers/pc80/pc/keyboard.c

@@ -7,7 +7,7 @@
 #include <arch/io.h>
 #include <delay.h>
 #include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 
 #define KBD_DATA	0x60
 #define KBD_COMMAND	0x64

src/drivers/pc80/rtc/mc146818rtc.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <arch/io.h>
 #include <bcd.h>
 #include <fallback.h>

src/drivers/pc80/tpm/tis.c

@@ -15,9 +15,9 @@
 #include <string.h>
 #include <delay.h>
 #include <device/mmio.h>
-#include <arch/acpi.h>
-#include <arch/acpigen.h>
-#include <arch/acpi_device.h>
+#include <acpi/acpi.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpi_device.h>
 #include <device/device.h>
 #include <console/console.h>
 #include <security/tpm/tis.h>

src/drivers/spi/acpi/acpi.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/drivers/spi/acpi/chip.h

@@ -4,7 +4,7 @@
 #ifndef __SPI_ACPI_CHIP_H__
 #define __SPI_ACPI_CHIP_H__
 
-#include <arch/acpi_device.h>
+#include <acpi/acpi_device.h>
 
 struct drivers_spi_acpi_config {
 	const char *hid;		/* ACPI _HID (required) */

src/drivers/tpm/tpm.c

@@ -7,7 +7,7 @@
 #include <security/tpm/tspi.h>
 
 #if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #endif
 
 static void init_tpm_dev(void *unused)

src/drivers/usb/acpi/chip.h

@@ -4,9 +4,9 @@
 #ifndef __USB_ACPI_CHIP_H__
 #define __USB_ACPI_CHIP_H__
 
-#include <arch/acpi_device.h>
-#include <arch/acpi.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_pld.h>
 
 struct drivers_usb_acpi_config {
 	const char *desc;

src/drivers/usb/acpi/usb_acpi.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpi_pld.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi_pld.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/drivers/wifi/generic.c

@@ -12,8 +12,8 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci_def.h>

src/ec/google/chromeec/ec_acpi.c

@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
-#include <arch/acpigen_ps2_keybd.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
+#include <acpi/acpigen_ps2_keybd.h>
 #include <console/console.h>
 #include <drivers/usb/acpi/chip.h>
 #include <stdlib.h>

src/ec/google/chromeec/i2c_tunnel/i2c_tunnel.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>

src/ec/google/chromeec/smihandler.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <ec/google/chromeec/ec.h>

src/ec/google/wilco/chip.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpigen.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpigen.h>
 #include <arch/cpu.h>
 #include <bootstate.h>
 #include <cbmem.h>

src/ec/google/wilco/smihandler.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 

src/ec/lenovo/h8/h8.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pnp.h>

src/ec/lenovo/h8/ssdt.c

@@ -2,7 +2,7 @@
 /* This file is part of the coreboot project. */
 
 #include <console/console.h>
-#include <arch/acpigen.h>
+#include <acpi/acpigen.h>
 #include <string.h>
 
 #include "h8.h"

src/include/acpi/acpi_pld.h

@@ -4,7 +4,7 @@
 #ifndef __ACPI_PLD_H
 #define __ACPI_PLD_H
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <stdint.h>
 
 enum acpi_pld_panel {

src/include/acpi/acpigen.h

@@ -5,9 +5,9 @@
 #define LIBACPI_H
 
 #include <stdint.h>
-#include <arch/acpi.h>
-#include <arch/acpi_device.h>
-#include <arch/acpi_pld.h>
+#include <acpi/acpi.h>
+#include <acpi/acpi_device.h>
+#include <acpi/acpi_pld.h>
 #include <device/pci_type.h>
 
 /* Values that can be returned for ACPI Device _STA method */

src/include/device/azalia_device.h

@@ -5,7 +5,7 @@
 #define DEVICE_AZALIA_H
 
 #include <types.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <device/mmio.h>
 #include <device/device.h>
 

src/include/device/pci_rom.h

@@ -2,7 +2,7 @@
 #define PCI_ROM_H
 #include <endian.h>
 #include <stddef.h>
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 
 #define PCI_ROM_HDR 0xAA55
 #define PCI_DATA_HDR ((uint32_t) (('R' << 24) | ('I' << 16) | ('C' << 8) | 'P'))

src/lib/coreboot_table.c

@@ -26,7 +26,7 @@
 #endif
 #if CONFIG(CHROMEOS)
 #if CONFIG(HAVE_ACPI_TABLES)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #endif
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <vendorcode/google/chromeos/gnvs.h>

src/lib/hardwaremain.c

@@ -21,7 +21,7 @@
 #include <boot/tables.h>
 #include <program_loading.h>
 #if CONFIG(HAVE_ACPI_RESUME)
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #endif
 #include <timer.h>
 #include <timestamp.h>

src/lib/nhlt.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 #include <cbfs.h>
 #include <commonlib/endian.h>
 #include <console/console.h>

src/mainboard/51nb/x210/dsdt.asl

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later  */
 /* This file is part of the coreboot project. */
 
-#include <arch/acpi.h>
+#include <acpi/acpi.h>
 
 DefinitionBlock(
 	"dsdt.aml",