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
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 1cd8953..2368bb2 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -17,9 +17,8 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <delay.h>
-#include "hudson.h"
+#include "hudson.h"
static void hda_init(struct device *dev)
{
diff --git a/src/southbridge/amd/agesa/hudson/imc.c b/src/southbridge/amd/agesa/hudson/imc.c
index 68ff7fb..9ba0731 100644
--- a/src/southbridge/amd/agesa/hudson/imc.c
+++ b/src/southbridge/amd/agesa/hudson/imc.c
@@ -15,7 +15,6 @@
#include "imc.h"
#include <device/mmio.h>
-#include <delay.h>
#include <Porting.h>
#include <AGESA.h>
#include <amdlib.h>
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c
index 75ec439..f6d3689 100644
--- a/src/southbridge/amd/agesa/hudson/sata.c
+++ b/src/southbridge/amd/agesa/hudson/sata.c
@@ -14,12 +14,11 @@
*/
#include <device/device.h>
-#include <delay.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include "hudson.h"
+#include "hudson.h"
static void sata_init(struct device *dev)
{
diff --git a/src/southbridge/amd/agesa/hudson/sd.c b/src/southbridge/amd/agesa/hudson/sd.c
index ec447ef..cc9470e 100644
--- a/src/southbridge/amd/agesa/hudson/sd.c
+++ b/src/southbridge/amd/agesa/hudson/sd.c
@@ -14,10 +14,10 @@
*/
#include <device/device.h>
-#include <delay.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
+
#include "hudson.h"
static void sd_init(struct device *dev)
diff --git a/src/southbridge/amd/agesa/hudson/smihandler.c b/src/southbridge/amd/agesa/hudson/smihandler.c
index a87b75d..1b9442b 100644
--- a/src/southbridge/amd/agesa/hudson/smihandler.c
+++ b/src/southbridge/amd/agesa/hudson/smihandler.c
@@ -19,12 +19,11 @@
*/
#include <arch/io.h>
+#include <cpu/x86/smm.h>
+
#include "hudson.h"
#include "smi.h"
-#include <cpu/x86/smm.h>
-#include <delay.h>
-
#define SMI_0x88_ACPI_COMMAND (1 << 11)
enum smi_source {
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index d5c92b4..9cdc1b4 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -17,7 +17,7 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <delay.h>
+
#include "hudson.h"
static const unsigned short pci_device_ids[] = {
diff --git a/src/southbridge/amd/pi/hudson/imc.c b/src/southbridge/amd/pi/hudson/imc.c
index 461d7b4..9ea8172 100644
--- a/src/southbridge/amd/pi/hudson/imc.c
+++ b/src/southbridge/amd/pi/hudson/imc.c
@@ -19,7 +19,6 @@
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/device.h>
-#include <delay.h>
#include <Porting.h>
#include <AGESA.h>
#include <Lib/amdlib.h>
diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c
index 153fe6d..08e967d 100644
--- a/src/southbridge/amd/pi/hudson/sata.c
+++ b/src/southbridge/amd/pi/hudson/sata.c
@@ -14,12 +14,11 @@
*/
#include <device/device.h>
-#include <delay.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include "hudson.h"
+#include "hudson.h"
static void sata_init(struct device *dev)
{
diff --git a/src/southbridge/amd/pi/hudson/sd.c b/src/southbridge/amd/pi/hudson/sd.c
index c419378..e4ace38 100644
--- a/src/southbridge/amd/pi/hudson/sd.c
+++ b/src/southbridge/amd/pi/hudson/sd.c
@@ -14,10 +14,10 @@
*/
#include <device/device.h>
-#include <delay.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
+
#include "hudson.h"
static void sd_init(struct device *dev)
diff --git a/src/southbridge/amd/pi/hudson/smihandler.c b/src/southbridge/amd/pi/hudson/smihandler.c
index a87b75d..1b9442b 100644
--- a/src/southbridge/amd/pi/hudson/smihandler.c
+++ b/src/southbridge/amd/pi/hudson/smihandler.c
@@ -19,12 +19,11 @@
*/
#include <arch/io.h>
+#include <cpu/x86/smm.h>
+
#include "hudson.h"
#include "smi.h"
-#include <cpu/x86/smm.h>
-#include <delay.h>
-
#define SMI_0x88_ACPI_COMMAND (1 << 11)
enum smi_source {
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index 23942fe..8843621 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -18,12 +18,11 @@
#include <arch/cbfs.h>
#include <ip_checksum.h>
#include <device/pci_def.h>
-#include <delay.h>
-
-#include "pch.h"
/* For DMI bar. */
#include <northbridge/intel/sandybridge/sandybridge.h>
+#include "pch.h"
+
#define SOUTHBRIDGE PCI_DEV(0, 0x1f, 0)
static void
diff --git a/src/southbridge/intel/fsp_rangeley/soc.c b/src/southbridge/intel/fsp_rangeley/soc.c
index ec5cd07..ec66c43 100644
--- a/src/southbridge/intel/fsp_rangeley/soc.c
+++ b/src/southbridge/intel/fsp_rangeley/soc.c
@@ -17,10 +17,10 @@
*/
#include <console/console.h>
-#include <delay.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
+
#include "soc.h"
static int soc_revision_id = -1;
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index 2deb929..cb1c190 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -21,8 +21,8 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <device/mmio.h>
-#include <delay.h>
#include <device/azalia_device.h>
+
#include "pch.h"
#include "hda_verb.h"
diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c
index bfa112a..88c599f 100644
--- a/src/southbridge/intel/lynxpoint/smihandler.c
+++ b/src/southbridge/intel/lynxpoint/smihandler.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <delay.h>
#include <types.h>
#include <arch/io.h>
#include <device/pci_ops.h>
@@ -29,12 +28,11 @@
#include <southbridge/intel/common/finalize.h>
#include <northbridge/intel/haswell/haswell.h>
#include <cpu/intel/haswell/haswell.h>
+
#include "me.h"
#include "pch.h"
-
#include "nvs.h"
-
static u8 smm_initialized = 0;
/* GNVS needs to be updated by an 0xEA PM Trap (B2) after it has been located
diff --git a/src/southbridge/nvidia/mcp55/early_setup_car.c b/src/southbridge/nvidia/mcp55/early_setup_car.c
index 3099a09..09414af 100644
--- a/src/southbridge/nvidia/mcp55/early_setup_car.c
+++ b/src/southbridge/nvidia/mcp55/early_setup_car.c
@@ -16,6 +16,7 @@
*/
#include <arch/io.h>
+#include <delay.h>
#ifdef UNUSED_CODE
int set_ht_link_buffer_counts_chain(u8 ht_c_num, unsigned vendorid, unsigned val);
diff --git a/src/southbridge/nvidia/mcp55/sata.c b/src/southbridge/nvidia/mcp55/sata.c
index 4c2830e..27f6073 100644
--- a/src/southbridge/nvidia/mcp55/sata.c
+++ b/src/southbridge/nvidia/mcp55/sata.c
@@ -19,10 +19,10 @@
#include <console/console.h>
#include <device/device.h>
-#include <delay.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
+
#include "mcp55.h"
static void sata_init(struct device *dev)