src: Use include <delay.h> when appropriate

Change-Id: I23bc0191ca8fcd88364e5c08be7c90195019e399
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32012
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Reviewed-by: David Guckian

7 files changed, 12 insertions, 16 deletions

diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c
index e42085dce5..7aaf016d29 100644
--- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c
+++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c
@@ -17,9 +17,9 @@
 /* Call-backs */
 
 #include <arch/cpu.h>
-#include <delay.h>
 #include <cpu/amd/msr.h>
 #include <console/console.h>
+
 #include "mcti.h"
 
 #define NVRAM_DDR2_800 0
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.c b/src/northbridge/intel/fsp_rangeley/northbridge.c
index edc623a33b..63f2068725 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.c
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.c
@@ -19,7 +19,6 @@
 #include <arch/acpi.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
-#include <delay.h>
 #include <cpu/intel/fsp_model_406dx/model_406dx.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 6e54208563..3549b49234 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -16,10 +16,12 @@
 
 #include <device/mmio.h>
 #include <console/console.h>
-#include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
+#include <drivers/intel/gma/edid.h>
+#include <drivers/intel/gma/opregion.h>
+#include <drivers/intel/gma/libgfxinit.h>
 #include <string.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
@@ -29,9 +31,6 @@
 #include "drivers/intel/gma/i915_reg.h"
 #include "chip.h"
 #include "gm45.h"
-#include <drivers/intel/gma/edid.h>
-#include <drivers/intel/gma/opregion.h>
-#include <drivers/intel/gma/libgfxinit.h>
 
 static struct resource *gtt_res = NULL;
 
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index 994296adb0..61265dd281 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -21,7 +21,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/mmio.h>
-#include <delay.h>
 #include <stdlib.h>
 #include <southbridge/intel/lynxpoint/hda_verb.h>
 
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index 4a048db7c7..c066634312 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -30,7 +30,7 @@
 #include <southbridge/intel/bd82x6x/me.h>
 #include <southbridge/intel/common/smbus.h>
 #include <cpu/x86/msr.h>
-#include <delay.h>
+
 #include "raminit_native.h"
 #include "raminit_common.h"
 #include "sandybridge.h"
diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index c36a10352e..c4e8bf1cdd 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -16,17 +16,12 @@
  */
 
 #include <console/console.h>
-#include <delay.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
 #include <cbmem.h>
-
-#include "drivers/intel/gma/i915_reg.h"
-#include "chip.h"
-#include "x4x.h"
 #include <drivers/intel/gma/intel_bios.h>
 #include <drivers/intel/gma/edid.h>
 #include <drivers/intel/gma/i915.h>
@@ -35,6 +30,10 @@
 #include <pc80/vga.h>
 #include <pc80/vga_io.h>
 
+#include "chip.h"
+#include "drivers/intel/gma/i915_reg.h"
+#include "x4x.h"
+
 #if CONFIG(SOUTHBRIDGE_INTEL_I82801JX)
 #include <southbridge/intel/i82801jx/nvs.h>
 #elif CONFIG(SOUTHBRIDGE_INTEL_I82801GX)
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index 02a8b74f70..4943428d0e 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -21,15 +21,12 @@
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
 #include <arch/cpu.h>
-#include <delay.h>
 #include <halt.h>
-#include "iomap.h"
 #if CONFIG(SOUTHBRIDGE_INTEL_I82801GX)
 #include <southbridge/intel/i82801gx/i82801gx.h> /* smbus_read_byte */
 #else
 #include <southbridge/intel/i82801jx/i82801jx.h> /* smbus_read_byte */
 #endif
-#include "x4x.h"
 #include <spd.h>
 #include <string.h>
 #include <device/dram/ddr2.h>
@@ -37,6 +34,9 @@
 #include <mrc_cache.h>
 #include <timestamp.h>
 
+#include "iomap.h"
+#include "x4x.h"
+
 #define MRC_CACHE_VERSION 0
 
 static inline int spd_read_byte(unsigned int device, unsigned int address)