summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/amd/agesa/heapmanager.c2
-rw-r--r--src/drivers/amd/agesa/romstage.c2
-rw-r--r--src/drivers/amd/agesa/state_machine.c2
-rw-r--r--src/drivers/crb/tis.c2
-rw-r--r--src/drivers/elog/elog.c2
-rw-r--r--src/drivers/generic/adau7002/adau7002.c4
-rw-r--r--src/drivers/generic/bayhub/chip.h2
-rw-r--r--src/drivers/generic/generic/chip.h2
-rw-r--r--src/drivers/generic/generic/generic.c4
-rw-r--r--src/drivers/generic/gpio_keys/chip.h2
-rw-r--r--src/drivers/generic/gpio_keys/gpio_keys.c4
-rw-r--r--src/drivers/generic/gpio_regulator/chip.h2
-rw-r--r--src/drivers/generic/gpio_regulator/gpio_regulator.c4
-rw-r--r--src/drivers/generic/max98357a/chip.h2
-rw-r--r--src/drivers/generic/max98357a/max98357a.c4
-rw-r--r--src/drivers/gfx/generic/chip.h2
-rw-r--r--src/drivers/gfx/generic/generic.c2
-rw-r--r--src/drivers/i2c/da7219/chip.h2
-rw-r--r--src/drivers/i2c/da7219/da7219.c6
-rw-r--r--src/drivers/i2c/designware/dw_i2c.c2
-rw-r--r--src/drivers/i2c/generic/chip.h2
-rw-r--r--src/drivers/i2c/generic/generic.c4
-rw-r--r--src/drivers/i2c/hid/hid.c2
-rw-r--r--src/drivers/i2c/max98373/max98373.c6
-rw-r--r--src/drivers/i2c/max98927/max98927.c6
-rw-r--r--src/drivers/i2c/nau8825/chip.h2
-rw-r--r--src/drivers/i2c/nau8825/nau8825.c6
-rw-r--r--src/drivers/i2c/rt1011/rt1011.c6
-rw-r--r--src/drivers/i2c/rt5663/chip.h2
-rw-r--r--src/drivers/i2c/rt5663/rt5663.c6
-rw-r--r--src/drivers/i2c/sx9310/chip.h2
-rw-r--r--src/drivers/i2c/sx9310/sx9310.c4
-rw-r--r--src/drivers/i2c/tpm/chip.c4
-rw-r--r--src/drivers/i2c/tpm/chip.h2
-rw-r--r--src/drivers/intel/fsp1_1/raminit.c2
-rw-r--r--src/drivers/intel/fsp1_1/ramstage.c2
-rw-r--r--src/drivers/intel/fsp1_1/romstage.c2
-rw-r--r--src/drivers/intel/gma/acpi.c4
-rw-r--r--src/drivers/intel/gma/intel_ddi.c2
-rw-r--r--src/drivers/intel/gma/opregion.c2
-rw-r--r--src/drivers/intel/ish/ish.c4
-rw-r--r--src/drivers/intel/mipi_camera/camera.c6
-rw-r--r--src/drivers/ipmi/ipmi_kcs_ops.c4
-rw-r--r--src/drivers/lenovo/wacom.c4
-rw-r--r--src/drivers/net/chip.h2
-rw-r--r--src/drivers/net/r8168.c4
-rw-r--r--src/drivers/pc80/pc/keyboard.c2
-rw-r--r--src/drivers/pc80/rtc/mc146818rtc.c2
-rw-r--r--src/drivers/pc80/tpm/tis.c6
-rw-r--r--src/drivers/spi/acpi/acpi.c4
-rw-r--r--src/drivers/spi/acpi/chip.h2
-rw-r--r--src/drivers/tpm/tpm.c2
-rw-r--r--src/drivers/usb/acpi/chip.h6
-rw-r--r--src/drivers/usb/acpi/usb_acpi.c6
-rw-r--r--src/drivers/wifi/generic.c4
55 files changed, 90 insertions, 90 deletions
diff --git a/src/drivers/amd/agesa/heapmanager.c b/src/drivers/amd/agesa/heapmanager.c
index 85f203c506..ea8abb52a5 100644
--- a/src/drivers/amd/agesa/heapmanager.c
+++ b/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>
diff --git a/src/drivers/amd/agesa/romstage.c b/src/drivers/amd/agesa/romstage.c
index 6c90ac2a12..3652f8f80d 100644
--- a/src/drivers/amd/agesa/romstage.c
+++ b/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>
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c
index a0d775295c..f9bf1fe2a9 100644
--- a/src/drivers/amd/agesa/state_machine.c
+++ b/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>
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 0e97a07848..d34091121b 100644
--- a/src/drivers/crb/tis.c
+++ b/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>
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index ab86f387cc..3bc52dd70d 100644
--- a/src/drivers/elog/elog.c
+++ b/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>
diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c
index bf2f03de04..ddf6b7a93e 100644
--- a/src/drivers/generic/adau7002/adau7002.c
+++ b/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>
diff --git a/src/drivers/generic/bayhub/chip.h b/src/drivers/generic/bayhub/chip.h
index 3a7b21d3e9..e4535b24c2 100644
--- a/src/drivers/generic/bayhub/chip.h
+++ b/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
diff --git a/src/drivers/generic/generic/chip.h b/src/drivers/generic/generic/chip.h
index 41b5f461db..47b83a740e 100644
--- a/src/drivers/generic/generic/chip.h
+++ b/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
diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c
index eed824d375..00b9dda02c 100644
--- a/src/drivers/generic/generic/generic.c
+++ b/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>
diff --git a/src/drivers/generic/gpio_keys/chip.h b/src/drivers/generic/gpio_keys/chip.h
index 9836abac60..e0ba3752d9 100644
--- a/src/drivers/generic/gpio_keys/chip.h
+++ b/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 */
diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c
index 1017f7a69f..732f02ad28 100644
--- a/src/drivers/generic/gpio_keys/gpio_keys.c
+++ b/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>
diff --git a/src/drivers/generic/gpio_regulator/chip.h b/src/drivers/generic/gpio_regulator/chip.h
index 8ae02ae3c2..f3d1d0f86a 100644
--- a/src/drivers/generic/gpio_regulator/chip.h
+++ b/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;
diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c
index 0ec1626da8..4eedb8bd7b 100644
--- a/src/drivers/generic/gpio_regulator/gpio_regulator.c
+++ b/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>
diff --git a/src/drivers/generic/max98357a/chip.h b/src/drivers/generic/max98357a/chip.h
index 95a58f09d6..248311cc38 100644
--- a/src/drivers/generic/max98357a/chip.h
+++ b/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 {
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index b9c270b0c5..52f08c69f7 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/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>
diff --git a/src/drivers/gfx/generic/chip.h b/src/drivers/gfx/generic/chip.h
index 8e70bc6978..67843fdb42 100644
--- a/src/drivers/gfx/generic/chip.h
+++ b/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 {
diff --git a/src/drivers/gfx/generic/generic.c b/src/drivers/gfx/generic/generic.c
index 4670b4d65f..2cbb17a06c 100644
--- a/src/drivers/gfx/generic/generic.c
+++ b/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>
diff --git a/src/drivers/i2c/da7219/chip.h b/src/drivers/i2c/da7219/chip.h
index 32d04dada1..9afce952c8 100644
--- a/src/drivers/i2c/da7219/chip.h
+++ b/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
diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c
index 931c437546..3b122026a3 100644
--- a/src/drivers/i2c/da7219/da7219.c
+++ b/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>
diff --git a/src/drivers/i2c/designware/dw_i2c.c b/src/drivers/i2c/designware/dw_i2c.c
index 74e24c7a53..dd5c17ce5a 100644
--- a/src/drivers/i2c/designware/dw_i2c.c
+++ b/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>
diff --git a/src/drivers/i2c/generic/chip.h b/src/drivers/i2c/generic/chip.h
index e1f4472a44..a9a7082b12 100644
--- a/src/drivers/i2c/generic/chip.h
+++ b/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
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 7e709d6cc7..38fa3ebeb9 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/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>
diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c
index 4fac85874d..b588115275 100644
--- a/src/drivers/i2c/hid/hid.c
+++ b/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>
diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c
index 067563868c..542dc98fb7 100644
--- a/src/drivers/i2c/max98373/max98373.c
+++ b/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>
diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c
index ddd9d152b0..0ea33d5f2b 100644
--- a/src/drivers/i2c/max98927/max98927.c
+++ b/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>
diff --git a/src/drivers/i2c/nau8825/chip.h b/src/drivers/i2c/nau8825/chip.h
index 80d950ff71..3f17a5674b 100644
--- a/src/drivers/i2c/nau8825/chip.h
+++ b/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
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index fd9cfc9679..1d31f302f8 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/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>
diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c
index ec018cc38f..da8ad4eaf0 100644
--- a/src/drivers/i2c/rt1011/rt1011.c
+++ b/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>
diff --git a/src/drivers/i2c/rt5663/chip.h b/src/drivers/i2c/rt5663/chip.h
index 6f7fbd87bb..ef498dba15 100644
--- a/src/drivers/i2c/rt5663/chip.h
+++ b/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 {
diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c
index 67d8dea562..0573454b7d 100644
--- a/src/drivers/i2c/rt5663/rt5663.c
+++ b/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>
diff --git a/src/drivers/i2c/sx9310/chip.h b/src/drivers/i2c/sx9310/chip.h
index b3820c80fc..bf4945b143 100644
--- a/src/drivers/i2c/sx9310/chip.h
+++ b/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
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 44cb883478..39299295cf 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/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>
diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c
index fbf9ffa667..e471652ef9 100644
--- a/src/drivers/i2c/tpm/chip.c
+++ b/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>
diff --git a/src/drivers/i2c/tpm/chip.h b/src/drivers/i2c/tpm/chip.h
index 491d0223f8..fadd1ec849 100644
--- a/src/drivers/i2c/tpm/chip.h
+++ b/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 {
diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c
index af554f43b4..a090a1fce5 100644
--- a/src/drivers/intel/fsp1_1/raminit.c
+++ b/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>
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index 8d51244914..11eee04e88 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/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>
diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c
index 5f7864412b..90760970a5 100644
--- a/src/drivers/intel/fsp1_1/romstage.c
+++ b/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>
diff --git a/src/drivers/intel/gma/acpi.c b/src/drivers/intel/gma/acpi.c
index 5a10ab4ed7..b7f4847ce5 100644
--- a/src/drivers/intel/gma/acpi.c
+++ b/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"
diff --git a/src/drivers/intel/gma/intel_ddi.c b/src/drivers/intel/gma/intel_ddi.c
index 59d3010be1..aac330415b 100644
--- a/src/drivers/intel/gma/intel_ddi.c
+++ b/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>
diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c
index 56449d0a11..cd42337d07 100644
--- a/src/drivers/intel/gma/opregion.c
+++ b/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>
diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 58402869f4..adfa4f1800 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/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>
diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index b8e1076346..16e139eb52 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/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>
diff --git a/src/drivers/ipmi/ipmi_kcs_ops.c b/src/drivers/ipmi/ipmi_kcs_ops.c
index 145313a599..c3b2b4ee2e 100644
--- a/src/drivers/ipmi/ipmi_kcs_ops.c
+++ b/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>
diff --git a/src/drivers/lenovo/wacom.c b/src/drivers/lenovo/wacom.c
index 442089814c..1da5ddc989 100644
--- a/src/drivers/lenovo/wacom.c
+++ b/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>
diff --git a/src/drivers/net/chip.h b/src/drivers/net/chip.h
index bc4ae4b6e8..df22db2107 100644
--- a/src/drivers/net/chip.h
+++ b/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;
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index b904586dd5..92cb9b54f2 100644
--- a/src/drivers/net/r8168.c
+++ b/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>
diff --git a/src/drivers/pc80/pc/keyboard.c b/src/drivers/pc80/pc/keyboard.c
index d841f946fb..64deacaea1 100644
--- a/src/drivers/pc80/pc/keyboard.c
+++ b/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
diff --git a/src/drivers/pc80/rtc/mc146818rtc.c b/src/drivers/pc80/rtc/mc146818rtc.c
index 419ed6b9fc..d34fbb13cf 100644
--- a/src/drivers/pc80/rtc/mc146818rtc.c
+++ b/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>
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 3d4c6b6d98..5994cefd86 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/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>
diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c
index 0eeaffbddd..39e887bfd9 100644
--- a/src/drivers/spi/acpi/acpi.c
+++ b/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>
diff --git a/src/drivers/spi/acpi/chip.h b/src/drivers/spi/acpi/chip.h
index b74c1776a2..ea369b308f 100644
--- a/src/drivers/spi/acpi/chip.h
+++ b/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) */
diff --git a/src/drivers/tpm/tpm.c b/src/drivers/tpm/tpm.c
index 53a0c4b59b..a38e18185a 100644
--- a/src/drivers/tpm/tpm.c
+++ b/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)
diff --git a/src/drivers/usb/acpi/chip.h b/src/drivers/usb/acpi/chip.h
index 42a94d5105..3bca91cf75 100644
--- a/src/drivers/usb/acpi/chip.h
+++ b/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;
diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c
index 916d3733ec..6720e2c394 100644
--- a/src/drivers/usb/acpi/usb_acpi.c
+++ b/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>
diff --git a/src/drivers/wifi/generic.c b/src/drivers/wifi/generic.c
index b864094499..ca16686ce6 100644
--- a/src/drivers/wifi/generic.c
+++ b/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>