diff --git a/plat/fvp/bl2_fvp_setup.c b/plat/fvp/bl2_fvp_setup.c
index 5764b6a..364833f 100644
--- a/plat/fvp/bl2_fvp_setup.c
+++ b/plat/fvp/bl2_fvp_setup.c
@@ -175,6 +175,9 @@
 
 	/* Initialize the platform config for future decision making */
 	fvp_config_setup();
+
+	/* Initialise the IO layer and register platform IO devices */
+	fvp_io_setup();
 }
 
 /*******************************************************************************
@@ -190,9 +193,6 @@
 	 * present.
 	 */
 	fvp_security_setup();
-
-	/* Initialise the IO layer and register platform IO devices */
-	fvp_io_setup();
 }
 
 /* Flush the TF params and the TF plat params */