soc/intel: Include <cpu/cpu.h> instead of <arch/cpu.h>
Also sort includes.
Change-Id: I7da9c672ee230dfaebd943247639b78d675957e4
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69032
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 99cf23f..f0903ff 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -2,16 +2,17 @@
#include <acpi/acpi_pm.h>
#include <acpi/acpigen.h>
-#include <arch/cpu.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <console/console.h>
-#include <cpu/intel/turbo.h>
-#include <cpu/intel/msr.h>
+#include <cpu/cpu.h>
#include <cpu/intel/common/common.h>
+#include <cpu/intel/msr.h>
+#include <cpu/intel/turbo.h>
+#include <cpu/x86/lapic.h>
#include <cpu/x86/smm.h>
-#include <intelblocks/acpi.h>
#include <intelblocks/acpi_wake_source.h>
+#include <intelblocks/acpi.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/sgx.h>
@@ -19,7 +20,6 @@
#include <soc/gpio.h>
#include <soc/iomap.h>
#include <soc/pm.h>
-#include <cpu/x86/lapic.h>
#define CPUID_6_EAX_ISST (1 << 7)