Fix order of remaining platform #includes
This fix modifies the order of system includes to meet the ARM TF coding
standard. There are some exceptions to this change in order to retain
header groupings and where there are headers within #if statements.
Change-Id: Ib5b668c992d817cc860e97b29e16ef106d17e404
Signed-off-by: Isla Mitchell <isla.mitchell@arm.com>
diff --git a/plat/mediatek/common/mtk_plat_common.c b/plat/mediatek/common/mtk_plat_common.c
index 4e8aaec..6a13192 100644
--- a/plat/mediatek/common/mtk_plat_common.c
+++ b/plat/mediatek/common/mtk_plat_common.c
@@ -12,8 +12,8 @@
#include <mmio.h>
#include <mtk_plat_common.h>
#include <mtk_sip_svc.h>
-#include <platform.h>
#include <plat_private.h>
+#include <platform.h>
#include <xlat_tables.h>
struct atf_arg_t gteearg;
diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c
index a70d103..803f1ed 100644
--- a/plat/mediatek/mt6795/bl31_plat_setup.c
+++ b/plat/mediatek/mt6795/bl31_plat_setup.c
@@ -3,9 +3,9 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <arch_helpers.h>
#include <arm_gic.h>
#include <assert.h>
-#include <arch_helpers.h>
#include <bl_common.h>
#include <cci.h>
#include <common_def.h>
@@ -15,11 +15,11 @@
#include <generic_delay_timer.h>
#include <mcucfg.h>
#include <mmio.h>
-#include <mtk_sip_svc.h>
-#include <mtk_plat_common.h>
#include <mt_cpuxgpt.h>
-#include <platform.h>
+#include <mtk_plat_common.h>
+#include <mtk_sip_svc.h>
#include <plat_private.h>
+#include <platform.h>
#include <string.h>
#include <xlat_tables.h>
/*******************************************************************************
diff --git a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c
index 1f64558..b357972 100644
--- a/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c
+++ b/plat/mediatek/mt6795/drivers/timer/mt_cpuxgpt.c
@@ -4,13 +4,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <stdint.h>
+
#include <arch_helpers.h>
+#include <debug.h>
#include <mmio.h>
#include <mt_cpuxgpt.h>
-#include <stdint.h>
#include <platform.h>
-#include <debug.h>
+#include <stdint.h>
#define CPUXGPT_BASE 0x10200000
#define INDEX_BASE (CPUXGPT_BASE+0x0674)
#define CTL_BASE (CPUXGPT_BASE+0x0670)
diff --git a/plat/mediatek/mt6795/plat_pm.c b/plat/mediatek/mt6795/plat_pm.c
index a0b7775..bd47bd8 100644
--- a/plat/mediatek/mt6795/plat_pm.c
+++ b/plat/mediatek/mt6795/plat_pm.c
@@ -14,8 +14,8 @@
#include <errno.h>
#include <mcucfg.h>
#include <mmio.h>
-#include <platform_def.h>
#include <plat_private.h>
+#include <platform_def.h>
#include <power_tracer.h>
#include <psci.h>
#include <scu.h>
diff --git a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c
index 6330b7b..25f2509 100644
--- a/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c
+++ b/plat/mediatek/mt8173/drivers/mtcmos/mtcmos.c
@@ -3,13 +3,14 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
+
+#include <debug.h>
+#include <delay_timer.h>
#include <mmio.h>
#include <mt8173_def.h>
-#include <debug.h>
#include <mtcmos.h>
#include <spm.h>
#include <spm_mcdi.h>
-#include <delay_timer.h>
enum {
SRAM_ISOINT_B = 1U << 6,
diff --git a/plat/mediatek/mt8173/plat_sip_calls.c b/plat/mediatek/mt8173/plat_sip_calls.c
index 76200ec..1d51cb5 100644
--- a/plat/mediatek/mt8173/plat_sip_calls.c
+++ b/plat/mediatek/mt8173/plat_sip_calls.c
@@ -6,8 +6,8 @@
#include <crypt.h>
#include <debug.h>
#include <mmio.h>
-#include <mtk_sip_svc.h>
#include <mtcmos.h>
+#include <mtk_sip_svc.h>
#include <plat_sip_calls.h>
#include <runtime_svc.h>