1 files changed, 11 insertions, 1 deletions

diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 7b0ab8336f3..af04e0891a7 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -21,9 +21,12 @@
 
 #include "devices-db5500.h"
 
-static struct map_desc u5500_io_desc[] __initdata = {
+static struct map_desc u5500_uart_io_desc[] __initdata = {
         __IO_DEV_DESC(U5500_UART0_BASE, SZ_4K),
         __IO_DEV_DESC(U5500_UART2_BASE, SZ_4K),
+};
+
+static struct map_desc u5500_io_desc[] __initdata = {
         __IO_DEV_DESC(U5500_GIC_CPU_BASE, SZ_4K),
         __IO_DEV_DESC(U5500_GIC_DIST_BASE, SZ_4K),
         __IO_DEV_DESC(U5500_L2CC_BASE, SZ_4K),
@@ -153,6 +156,13 @@ static void __init db5500_add_gpios(void)
 
 void __init u5500_map_io(void)
 {
+        /*
+         * Map the UARTs early so that the DEBUG_LL stuff continues to work.
+         */
+        iotable_init(u5500_uart_io_desc, ARRAY_SIZE(u5500_uart_io_desc));
+
+        ux500_map_io();
+
         iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc));
 }