ARM: zynq: make use of debug_ll_io_init()

Convert low-level debugging routines to make use of debug_ll_io_init().
This is part of the preparation for ARCH_MULTIPLATFORM support for Zynq.

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>

1 files changed, 7 insertions, 18 deletions

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 2202f67c8a09..a2f48daa11ca 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -72,23 +72,11 @@ static void __init xilinx_irq_init(void)
  * running include the GIC, UART and Timer Counter.
  */
 
-static struct map_desc io_desc[] __initdata = {
-        {
-                .virtual        = SCU_PERIPH_VIRT,
-                .pfn            = __phys_to_pfn(SCU_PERIPH_PHYS),
-                .length         = SCU_PERIPH_SIZE,
-                .type           = MT_DEVICE,
-        },
-
-#ifdef CONFIG_DEBUG_LL
-        {
-                .virtual        = LL_UART_VADDR,
-                .pfn            = __phys_to_pfn(LL_UART_PADDR),
-                .length         = UART_SIZE,
-                .type           = MT_DEVICE,
-        },
-#endif
-
+static struct map_desc scu_desc __initdata = {
+        .virtual        = SCU_PERIPH_VIRT,
+        .pfn            = __phys_to_pfn(SCU_PERIPH_PHYS),
+        .length         = SCU_PERIPH_SIZE,
+        .type           = MT_DEVICE,
 };
 
 static void __init xilinx_zynq_timer_init(void)
@@ -117,7 +105,8 @@ static struct sys_timer xttcpss_sys_timer = {
  */
 static void __init xilinx_map_io(void)
 {
-        iotable_init(io_desc, ARRAY_SIZE(io_desc));
+        debug_ll_io_init();
+        iotable_init(&scu_desc, 1);
 }
 
 static const char *xilinx_dt_match[] = {