ARM: zynq: make use of debug_ll_io_init() (385f02b1) · Commits · 戴 / test

arch/arm/Kconfig.debug

+1 −0

Original line number	Diff line number	Diff line
		@@ -435,6 +435,7 @@ config DEBUG_LL_INCLUDE
		default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
		default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT \|\| \
		DEBUG_VEXPRESS_UART0_CA9 \|\| DEBUG_VEXPRESS_UART0_RS1
		default "debug/zynq.S" if DEBUG_ZYNQ_UART0 \|\| DEBUG_ZYNQ_UART1
		default "mach/debug-macro.S"

		config EARLY_PRINTK

+1 −2

Original line number	Diff line number	Diff line
		/* arch/arm/mach-zynq/include/mach/debug-macro.S
		*
		/*
		* Debugging macro include header
		*
		* Copyright (C) 2011 Xilinx

+7 −18

Original line number	Diff line number	Diff line
		@@ -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 = {
		{
		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,
		},

		#ifdef CONFIG_DEBUG_LL
		{
		.virtual = LL_UART_VADDR,
		.pfn = __phys_to_pfn(LL_UART_PADDR),
		.length = UART_SIZE,
		.type = MT_DEVICE,
		},
		#endif

		};

		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[] = {