src: Use #include <timer.h> when appropriate

Also, extra-lines added or removed and local includes moved down.

Change-Id: I5e739233f3742fd68d537f671642bb04886e3009
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32009
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

9 files changed, 6 insertions, 8 deletions

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index e766c77f3f..22f53094a1 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -35,8 +35,8 @@
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/smbus.h>
-#include <timer.h>
 #include <security/vboot/vbnv.h>
+
 #include "chip.h"
 
 static uintptr_t read_pmc_mmio_bar(void)
diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c
index 310a0c69d7..ab36c70c10 100644
--- a/src/soc/intel/cannonlake/pmutil.c
+++ b/src/soc/intel/cannonlake/pmutil.c
@@ -38,8 +38,8 @@
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/smbus.h>
-#include <timer.h>
 #include <security/vboot/vbnv.h>
+
 #include "chip.h"
 
 /*
diff --git a/src/soc/intel/cannonlake/reset.c b/src/soc/intel/cannonlake/reset.c
index a6f8092908..e92396f39a 100644
--- a/src/soc/intel/cannonlake/reset.c
+++ b/src/soc/intel/cannonlake/reset.c
@@ -20,7 +20,6 @@
 #include <fsp/util.h>
 #include <soc/intel/common/reset.h>
 #include <string.h>
-#include <timer.h>
 #include <soc/pci_devs.h>
 
 /* Reset Request  */
diff --git a/src/soc/intel/common/block/systemagent/systemagent_early.c b/src/soc/intel/common/block/systemagent/systemagent_early.c
index 93fa5df9c9..a3e278f3f7 100644
--- a/src/soc/intel/common/block/systemagent/systemagent_early.c
+++ b/src/soc/intel/common/block/systemagent/systemagent_early.c
@@ -22,8 +22,8 @@
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
+
 #include "systemagent_def.h"
-#include <timer.h>
 
 #if !ENV_RAMSTAGE
 void bootblock_systemagent_early_init(void)
diff --git a/src/soc/intel/icelake/pmutil.c b/src/soc/intel/icelake/pmutil.c
index fa2411ddd2..96ff52d122 100644
--- a/src/soc/intel/icelake/pmutil.c
+++ b/src/soc/intel/icelake/pmutil.c
@@ -37,8 +37,8 @@
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <soc/smbus.h>
-#include <timer.h>
 #include <security/vboot/vbnv.h>
+
 #include "chip.h"
 
 /*
diff --git a/src/soc/intel/icelake/reset.c b/src/soc/intel/icelake/reset.c
index 854723ca07..470b5f4fde 100644
--- a/src/soc/intel/icelake/reset.c
+++ b/src/soc/intel/icelake/reset.c
@@ -20,7 +20,6 @@
 #include <fsp/util.h>
 #include <soc/intel/common/reset.h>
 #include <string.h>
-#include <timer.h>
 #include <soc/pci_devs.h>
 
 /* Reset Request  */
diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c
index 79901f29ff..bdf86b1f12 100644
--- a/src/soc/intel/quark/storage_test.c
+++ b/src/soc/intel/quark/storage_test.c
@@ -25,6 +25,7 @@
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 #include <soc/storage_test.h>
+#include <timer.h>
 #include <string.h>
 
 #if CONFIG(STORAGE_LOG)
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index b517e6d6a9..7d0dc0adb8 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -37,8 +37,8 @@
 #include <soc/pm.h>
 #include <soc/pmc.h>
 #include <soc/smbus.h>
-#include <timer.h>
 #include <security/vboot/vbnv.h>
+
 #include "chip.h"
 
 /*
diff --git a/src/soc/intel/skylake/reset.c b/src/soc/intel/skylake/reset.c
index f73563e05e..ff1a959194 100644
--- a/src/soc/intel/skylake/reset.c
+++ b/src/soc/intel/skylake/reset.c
@@ -20,7 +20,6 @@
 #include <soc/intel/common/reset.h>
 #include <soc/me.h>
 #include <soc/pm.h>
-#include <timer.h>
 
 static void do_force_global_reset(void)
 {