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

25 files changed, 17 insertions, 34 deletions

diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index 25c466008a..798fc12caf 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -16,7 +16,6 @@
  */
 
 #include <device/device.h>
-#include <delay.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <arch/interrupt.h>
@@ -24,6 +23,7 @@
 #include <arch/acpigen.h>
 #include <drivers/intel/gma/int15.h>
 #include <ec/acpi/ec.h>
+
 #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
 
 static acpi_cstate_t cst_entries[] = {
diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index baff7c1905..88cc4c0eb6 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -18,7 +18,6 @@
 #include <cpu/x86/smm.h>
 #include <southbridge/intel/i82801gx/nvs.h>
 #include <southbridge/intel/common/pmutil.h>
-#include <delay.h>
 
 #define GPE_EC_SCI	12
 
diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c
index d3091ad8f4..daddf5c04f 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -16,7 +16,6 @@
 
 #include <arch/mmu.h>
 #include <boot/coreboot_tables.h>
-#include <delay.h>
 #include <device/device.h>
 #include <memrange.h>
 #include <soc/addressmap.h>
diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c
index 5684f8f867..c8ab88a7fa 100644
--- a/src/mainboard/google/gale/mainboard.c
+++ b/src/mainboard/google/gale/mainboard.c
@@ -16,7 +16,6 @@
 
 #include <boardid.h>
 #include <boot/coreboot_tables.h>
-#include <delay.h>
 #include <device/device.h>
 #include <gpio.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/google/oak/bootblock.c b/src/mainboard/google/oak/bootblock.c
index 4df7eeb047..3c50389914 100644
--- a/src/mainboard/google/oak/bootblock.c
+++ b/src/mainboard/google/oak/bootblock.c
@@ -15,7 +15,6 @@
 
 #include <boardid.h>
 #include <bootblock_common.h>
-#include <delay.h>
 #include <gpio.h>
 #include <device/mmio.h>
 #include <soc/gpio.h>
diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c
index e47edc74ca..37c7853347 100644
--- a/src/mainboard/google/slippy/variants/peppy/romstage.c
+++ b/src/mainboard/google/slippy/variants/peppy/romstage.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <delay.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mainboard/google/slippy/variants/wolf/romstage.c b/src/mainboard/google/slippy/variants/wolf/romstage.c
index 3125efe978..731b35748d 100644
--- a/src/mainboard/google/slippy/variants/wolf/romstage.c
+++ b/src/mainboard/google/slippy/variants/wolf/romstage.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <delay.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/mainboard/google/smaug/romstage.c b/src/mainboard/google/smaug/romstage.c
index fd7c07f84d..1d10d0e1aa 100644
--- a/src/mainboard/google/smaug/romstage.c
+++ b/src/mainboard/google/smaug/romstage.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <delay.h>
 #include <soc/addressmap.h>
 #include <device/i2c_simple.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
index 940752803e..3870b63a60 100644
--- a/src/mainboard/google/veyron/romstage.c
+++ b/src/mainboard/google/veyron/romstage.c
@@ -20,7 +20,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/mmio.h>
-#include <delay.h>
 #include <program_loading.h>
 #include <soc/sdram.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c
index f29c9d0d8c..bb239732b5 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -16,7 +16,6 @@
 #include <arch/cache.h>
 #include <device/mmio.h>
 #include <boot/coreboot_tables.h>
-#include <delay.h>
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <edid.h>
diff --git a/src/mainboard/google/veyron_mickey/romstage.c b/src/mainboard/google/veyron_mickey/romstage.c
index a2e8b367e1..c8a98428e9 100644
--- a/src/mainboard/google/veyron_mickey/romstage.c
+++ b/src/mainboard/google/veyron_mickey/romstage.c
@@ -20,7 +20,6 @@
 #include <cbmem.h>
 #include <console/console.h>
 #include <device/mmio.h>
-#include <delay.h>
 #include <program_loading.h>
 #include <soc/sdram.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index 05973058d3..074e6a4e99 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -17,7 +17,6 @@
 #include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <console/console.h>
-#include <delay.h>
 #include <device/device.h>
 #include <device/i2c_simple.h>
 #include <edid.h>
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
index 64119c1fd1..d9fc42b7e6 100644
--- a/src/mainboard/google/veyron_rialto/romstage.c
+++ b/src/mainboard/google/veyron_rialto/romstage.c
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <delay.h>
 #include <program_loading.h>
 #include <soc/sdram.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c
index e1527d848d..27b1ac2a7c 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard_smi.c
@@ -18,16 +18,15 @@
  * SMI handler -- mostly takes care of SMIs from the EC
  */
 
-#include "ec.h"
-
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include <delay.h>
 #include <ec/compal/ene932/ec.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 #include <southbridge/amd/agesa/hudson/smi.h>
 
+#include "ec.h"
+
 #define ACPI_PM1_CNT_SLEEP(state) ((1 << 13) | (state & 0x7) << 10)
 
 enum sleep_states {
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index b78ed1bd3e..4b1f09f2e8 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -14,17 +14,17 @@
 
 #include <assert.h>
 #include <bootmode.h>
-#include <delay.h>
 #include <device/i2c_simple.h>
 #include <soc/i2c.h>
 #include <soc/reg_access.h>
-#include "reg_access.h"
-#include "gen1.h"
-#include "gen2.h"
 #include <spi_flash.h>
 #include <security/vboot/vboot_common.h>
 #include <security/vboot/vbnv.h>
 
+#include "reg_access.h"
+#include "gen1.h"
+#include "gen2.h"
+
 int clear_recovery_mode_switch(void)
 {
 	/* Nothing to do */
diff --git a/src/mainboard/lenovo/g505s/mainboard_smi.c b/src/mainboard/lenovo/g505s/mainboard_smi.c
index 2eaf7ca49b..27b1ac2a7c 100644
--- a/src/mainboard/lenovo/g505s/mainboard_smi.c
+++ b/src/mainboard/lenovo/g505s/mainboard_smi.c
@@ -17,16 +17,16 @@
 /*
  * SMI handler -- mostly takes care of SMIs from the EC
  */
-#include "ec.h"
 
 #include <arch/io.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include <delay.h>
 #include <ec/compal/ene932/ec.h>
 #include <southbridge/amd/agesa/hudson/hudson.h>
 #include <southbridge/amd/agesa/hudson/smi.h>
 
+#include "ec.h"
+
 #define ACPI_PM1_CNT_SLEEP(state) ((1 << 13) | (state & 0x7) << 10)
 
 enum sleep_states {
diff --git a/src/mainboard/lenovo/s230u/smihandler.c b/src/mainboard/lenovo/s230u/smihandler.c
index 2f79243e62..3c4df31f08 100644
--- a/src/mainboard/lenovo/s230u/smihandler.c
+++ b/src/mainboard/lenovo/s230u/smihandler.c
@@ -16,16 +16,15 @@
  * GNU General Public License for more details.
  */
 
-#include "ec.h"
-
 #include <console/console.h>
 #include <cpu/x86/smm.h>
-#include <delay.h>
 #include <ec/acpi/ec.h>
 #include <ec/compal/ene932/ec.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <southbridge/intel/common/pmutil.h>
 
+#include "ec.h"
+
 #define GPE_PALMDET1	2
 #define GPE_PALMDET2	4
 #define GPE_EC_SCI	7
diff --git a/src/mainboard/lenovo/x200/dock.c b/src/mainboard/lenovo/x200/dock.c
index 6e87644302..d5f774bb48 100644
--- a/src/mainboard/lenovo/x200/dock.c
+++ b/src/mainboard/lenovo/x200/dock.c
@@ -16,17 +16,18 @@
  */
 
 #define __SIMPLE_DEVICE__
+
 #include <console/console.h>
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <delay.h>
-#include "dock.h"
 #include <southbridge/intel/i82801ix/i82801ix.h>
 #include <ec/lenovo/h8/h8.h>
 #include <ec/acpi/ec.h>
 
+#include "dock.h"
+
 #define LPC_DEV PCI_DEV(0, 0x1f, 0)
 
 void h8_mainboard_init_dock (void)
diff --git a/src/mainboard/opencellular/elgon/mainboard.c b/src/mainboard/opencellular/elgon/mainboard.c
index d140bc1ec9..74e31e1709 100644
--- a/src/mainboard/opencellular/elgon/mainboard.c
+++ b/src/mainboard/opencellular/elgon/mainboard.c
@@ -20,7 +20,6 @@
 #include <libbdk-hal/bdk-config.h>
 #include <libbdk-hal/bdk-twsi.h>
 #include <soc/gpio.h>
-#include <delay.h>
 #include <soc/uart.h>
 #include <console/console.h>
 #include <soc/clock.h>
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index 8e4293bdb7..09310aef72 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -19,7 +19,6 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/io.h>
-#include <delay.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <northbridge/intel/nehalem/nehalem.h>
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 35b90f6a2a..8442dfaee9 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -28,7 +28,6 @@
 #include <cpu/x86/bist.h>
 #include <cpu/intel/romstage.h>
 #include <ec/acpi/ec.h>
-#include <delay.h>
 #include <timestamp.h>
 #include <arch/acpi.h>
 
diff --git a/src/mainboard/packardbell/ms2290/smihandler.c b/src/mainboard/packardbell/ms2290/smihandler.c
index e4c29b1d70..ff13543cde 100644
--- a/src/mainboard/packardbell/ms2290/smihandler.c
+++ b/src/mainboard/packardbell/ms2290/smihandler.c
@@ -24,7 +24,6 @@
 #include <northbridge/intel/nehalem/nehalem.h>
 #include <cpu/intel/model_2065x/model_2065x.h>
 #include <ec/acpi/ec.h>
-#include <delay.h>
 
 static void mainboard_smm_init(void)
 {
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 843ca60577..91c11d5830 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -18,10 +18,9 @@
 #include <device/device.h>
 #include <arch/io.h>
 #include <arch/interrupt.h>
-#include <delay.h>
 #include <drivers/intel/gma/int15.h>
-
 #include <ec/acpi/ec.h>
+
 #include "m3885.h"
 
 #define DUMP_RUNTIME_REGISTERS 0
diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.c b/src/mainboard/siemens/mc_tcu3/ptn3460.c
index 8143a16957..9acc60a345 100644
--- a/src/mainboard/siemens/mc_tcu3/ptn3460.c
+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.c
@@ -16,6 +16,8 @@
 #include <console/console.h>
 #include <hwilib.h>
 #include <string.h>
+#include <delay.h>
+
 #include "soc/i2c.h"
 #include "ptn3460.h"
 
diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.h b/src/mainboard/siemens/mc_tcu3/ptn3460.h
index 217c68a110..8dc002dc39 100644
--- a/src/mainboard/siemens/mc_tcu3/ptn3460.h
+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.h
@@ -16,7 +16,6 @@
 #ifndef PTN3460_H_
 #define PTN3460_H_
 
-#include <delay.h>
 #include "lcd_panel.h"
 
 #define PTN_SLAVE_ADR		0x20