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/nvidia/tegra/common/aarch64/tegra_helpers.S b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
index 22389f2..e5e5126 100644
--- a/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
+++ b/plat/nvidia/tegra/common/aarch64/tegra_helpers.S
@@ -7,8 +7,8 @@
#include <asm_macros.S>
#include <assert_macros.S>
#include <cpu_macros.S>
-#include <cortex_a57.h>
#include <cortex_a53.h>
+#include <cortex_a57.h>
#include <platform_def.h>
#include <tegra_def.h>
diff --git a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
index 585c115..2d827da 100644
--- a/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
+++ b/plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c
@@ -6,12 +6,12 @@
#include <arch_helpers.h>
#include <assert.h>
+#include <cortex_a53.h>
#include <debug.h>
#include <delay_timer.h>
+#include <flowctrl.h>
#include <mmio.h>
#include <pmc.h>
-#include <cortex_a53.h>
-#include <flowctrl.h>
#include <tegra_def.h>
#define CLK_RST_DEV_L_SET 0x300
diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c
index bc16857..d5d3d53 100644
--- a/plat/nvidia/tegra/common/tegra_bl31_setup.c
+++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c
@@ -10,8 +10,8 @@
#include <bl31.h>
#include <bl_common.h>
#include <console.h>
-#include <cortex_a57.h>
#include <cortex_a53.h>
+#include <cortex_a57.h>
#include <debug.h>
#include <denver.h>
#include <errno.h>
diff --git a/plat/nvidia/tegra/common/tegra_gic.c b/plat/nvidia/tegra/common/tegra_gic.c
index ae56d55..e480e77 100644
--- a/plat/nvidia/tegra/common/tegra_gic.c
+++ b/plat/nvidia/tegra/common/tegra_gic.c
@@ -5,16 +5,16 @@
*/
#include <arch_helpers.h>
-#include <assert.h>
#include <arm_gic.h>
+#include <assert.h>
#include <bl_common.h>
#include <debug.h>
#include <gic_v2.h>
#include <interrupt_mgmt.h>
#include <platform.h>
#include <stdint.h>
-#include <tegra_private.h>
#include <tegra_def.h>
+#include <tegra_private.h>
/* Value used to initialize Non-Secure IRQ priorities four at a time */
#define GICD_IPRIORITYR_DEF_VAL \
diff --git a/plat/nvidia/tegra/common/tegra_pm.c b/plat/nvidia/tegra/common/tegra_pm.c
index 6f841ef..0c25934 100644
--- a/plat/nvidia/tegra/common/tegra_pm.c
+++ b/plat/nvidia/tegra/common/tegra_pm.c
@@ -7,9 +7,9 @@
#include <arch_helpers.h>
#include <assert.h>
#include <bl_common.h>
+#include <console.h>
#include <context.h>
#include <context_mgmt.h>
-#include <console.h>
#include <debug.h>
#include <memctrl.h>
#include <mmio.h>
diff --git a/plat/nvidia/tegra/common/tegra_sip_calls.c b/plat/nvidia/tegra/common/tegra_sip_calls.c
index dcad21e..d96ce7a 100644
--- a/plat/nvidia/tegra/common/tegra_sip_calls.c
+++ b/plat/nvidia/tegra/common/tegra_sip_calls.c
@@ -13,8 +13,8 @@
#include <memctrl.h>
#include <mmio.h>
#include <runtime_svc.h>
-#include <tegra_private.h>
#include <tegra_platform.h>
+#include <tegra_private.h>
/*******************************************************************************
* Common Tegra SiP SMCs
diff --git a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
index 9b7dc85..1cffb74 100644
--- a/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t132/plat_psci_handlers.c
@@ -7,9 +7,9 @@
#include <arch.h>
#include <arch_helpers.h>
#include <assert.h>
-#include <denver.h>
#include <debug.h>
#include <delay_timer.h>
+#include <denver.h>
#include <flowctrl.h>
#include <mmio.h>
#include <platform_def.h>
diff --git a/plat/nvidia/tegra/soc/t132/plat_secondary.c b/plat/nvidia/tegra/soc/t132/plat_secondary.c
index 96f514d..d5ca30c 100644
--- a/plat/nvidia/tegra/soc/t132/plat_secondary.c
+++ b/plat/nvidia/tegra/soc/t132/plat_secondary.c
@@ -10,8 +10,8 @@
#include <denver.h>
#include <mmio.h>
#include <platform.h>
-#include <psci.h>
#include <pmc.h>
+#include <psci.h>
#include <tegra_def.h>
#define SB_CSR 0x0
diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
index 2803f4e..d34f7e2 100644
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/ari.c
@@ -10,8 +10,8 @@
#include <debug.h>
#include <delay_timer.h>
#include <denver.h>
-#include <mmio.h>
#include <mce_private.h>
+#include <mmio.h>
#include <platform.h>
#include <sys/errno.h>
#include <t18x_ari.h>
diff --git a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
index 9c115bd..243c8f3 100644
--- a/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
+++ b/plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
@@ -8,8 +8,8 @@
#include <arch_helpers.h>
#include <debug.h>
#include <denver.h>
-#include <mmio.h>
#include <mce_private.h>
+#include <mmio.h>
#include <sys/errno.h>
#include <t18x_ari.h>
diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
index 3dff653..f77746c 100644
--- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
@@ -8,12 +8,12 @@
#include <assert.h>
#include <debug.h>
#include <delay_timer.h>
+#include <flowctrl.h>
#include <mmio.h>
#include <platform.h>
#include <platform_def.h>
-#include <psci.h>
#include <pmc.h>
-#include <flowctrl.h>
+#include <psci.h>
#include <tegra_def.h>
#include <tegra_private.h>