From 0045c0dd2f643b74f7089253d6ffa1bbb72d3d87 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 3 Dec 2015 18:27:53 +0100 Subject: ARM: debug-ll: rework footbridge handling Footbridge has two debug ports that are handled a bit differently: The 8250 port uses the normal debug/8250.S implementation that is shared with a lot of other platforms, but it relies on the DEBUG_UART_8250 option to be turned on automatically instead of being selected by DEBUG_FOOTBRIDGE_COM1 as we do for most other platforms. I'm changing this to use a 'select' and change the dependency to the debug symbol rather than the platform symbol for consistency. The DC21285 UART has a separate top-level option, and relies on the traditional include/mach/debug-macro.S method. With the s3c64xx multiplatform series queued up for 4.5, it is now the last one that does this, so by moving this file to include/debug/dc21285.S, we can get all platforms to do things the same way. Signed-off-by: Arnd Bergmann --- .../arm/mach-footbridge/include/mach/debug-macro.S | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 arch/arm/mach-footbridge/include/mach/debug-macro.S (limited to 'arch/arm/mach-footbridge/include') diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S deleted file mode 100644 index 02247f313e94..000000000000 --- a/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ /dev/null @@ -1,42 +0,0 @@ -/* arch/arm/mach-footbridge/include/mach/debug-macro.S - * - * Debugging macro include header - * - * Copyright (C) 1994-1999 Russell King - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -*/ - -#include - -#include - /* For EBSA285 debugging */ - .equ dc21285_high, ARMCSR_BASE & 0xff000000 - .equ dc21285_low, ARMCSR_BASE & 0x00ffffff - - .macro addruart, rp, rv, tmp - .if dc21285_low - mov \rp, #dc21285_low - .else - mov \rp, #0 - .endif - orr \rv, \rp, #dc21285_high - orr \rp, \rp, #0x42000000 - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0x160] @ UARTDR - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x178] @ UARTFLG - tst \rd, #1 << 3 - bne 1001b - .endm - - .macro waituart,rd,rx - .endm -- cgit