redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: debug: provide 8250 debug uart register shift configuration option 

Move the definition of the UART register shift out of the platform
specific header file into the Kconfig files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
hifive-unleashed-5.1
Russell King 2013-07-06 23:13:15 +01:00
parent 7610b607b0
commit 4a00364736
20 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/Kconfig.debug
View File

@ -275,6 +275,7 @@ choice
config DEBUG_MMP_UART2
bool "Kernel low-level debugging message via MMP UART2"
depends on ARCH_MMP
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on MMP UART2.
@ -282,6 +283,7 @@ choice
config DEBUG_MMP_UART3
bool "Kernel low-level debugging message via MMP UART3"
depends on ARCH_MMP
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on MMP UART3.
@ -326,6 +328,7 @@ choice
config DEBUG_MVEBU_UART
bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
depends on ARCH_MVEBU
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on MVEBU based platforms.
@ -344,6 +347,7 @@ choice
config DEBUG_MVEBU_UART_ALTERNATE
bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"
depends on ARCH_MVEBU
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on MVEBU based platforms.
@ -365,6 +369,7 @@ choice
config DEBUG_NSPIRE_CLASSIC_UART
bool "Kernel low-level debugging via TI-NSPIRE 8250 UART"
depends on ARCH_NSPIRE
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on TI-NSPIRE classic models.
@ -453,6 +458,7 @@ choice
config DEBUG_PXA_UART1
depends on ARCH_PXA
bool "Use PXA UART1 for low-level debug"
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on PXA UART1.
@ -477,6 +483,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK29 UART0"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -485,6 +492,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK29 UART1"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -493,6 +501,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK29 UART2"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -501,6 +510,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK3X UART0"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -509,6 +519,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK3X UART1"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -517,6 +528,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK3X UART2"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -525,6 +537,7 @@ choice
bool "Kernel low-level debugging messages via Rockchip RK3X UART3"
depends on ARCH_ROCKCHIP
select DEBUG_ROCKCHIP_UART
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Rockchip based platforms.
@ -587,6 +600,7 @@ choice
config DEBUG_SUNXI_UART0
bool "Kernel low-level debugging messages via sunXi UART0"
depends on ARCH_SUNXI
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Allwinner A1X based platforms on the UART0.
@ -594,6 +608,7 @@ choice
config DEBUG_SUNXI_UART1
bool "Kernel low-level debugging messages via sunXi UART1"
depends on ARCH_SUNXI
select DEBUG_UART_8250
help
Say Y here if you want kernel low-level debugging support
on Allwinner A1X based platforms on the UART1.
@ -857,8 +872,17 @@ config DEBUG_LL_INCLUDE
default "mach/debug-macro.S"
config DEBUG_UART_8250
def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
ARCH_GEMINI || ARCH_RPC
def_bool ARCH_DOVE || ARCH_EBSA110 || \
(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"
depends on DEBUG_UART_8250
default 0 if FOOTBRIDGE || ARCH_IOP32X
default 2
config DEBUG_UART_8250_FLOW_CONTROL
bool "Enable flow control for 8250 UART"

4
arch/arm/include/asm/hardware/debug-8250.S
View File

@ -9,6 +9,10 @@
*/
#include <linux/serial_reg.h>
#ifndef UART_SHIFT
#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
#endif
.macro senduart,rd,rx
strb \rd, [\rx, #UART_TX << UART_SHIFT]
.endm

1
arch/arm/include/debug/mvebu.S
View File

@ -26,5 +26,4 @@
orr \rv, \rv, #0x00012000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/include/debug/nspire.S
View File

@ -23,6 +23,5 @@
#endif
#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>
#endif

1
arch/arm/include/debug/pxa.S
View File

@ -29,5 +29,4 @@
ldr \rv, =PXA_UART_REG_VIRT_BASE
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/include/debug/rockchip.S
View File

@ -38,5 +38,4 @@
ldr \rv, =ROCKCHIP_UART_DEBUG_VIRT_BASE
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/include/debug/sunxi.S
View File

@ -23,5 +23,4 @@
ldr \rv, =SUNXI_UART_DEBUG_VIRT_BASE
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-dove/include/mach/debug-macro.S
View File

@ -15,5 +15,4 @@
orr \rv, \rv, #0x00012000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-ebsa110/include/mach/debug-macro.S
View File

@ -17,5 +17,4 @@
mov \rp, \rv
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-footbridge/include/mach/debug-macro.S
View File

@ -22,7 +22,6 @@
orr \rp, \rp, #0x7c000000 @ physical
.endm
#define UART_SHIFT 0
#include <asm/hardware/debug-8250.S>
#else

1
arch/arm/mach-gemini/include/mach/debug-macro.S
View File

@ -16,5 +16,4 @@
ldr \rv, =IO_ADDRESS(GEMINI_UART_BASE) @ virtual
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-iop13xx/include/mach/debug-macro.S
View File

@ -20,5 +20,4 @@
orr \rp, \rp, #0x00d80000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-iop32x/include/mach/debug-macro.S
View File

@ -17,5 +17,4 @@
mov \rv, \rp
.endm
#define UART_SHIFT 0
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-iop33x/include/mach/debug-macro.S
View File

@ -18,5 +18,4 @@
orr \rp, #0xff000000 @ physical
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-ixp4xx/include/mach/debug-macro.S
View File

@ -22,5 +22,4 @@
orr \rp, \rp, #0xc8000000 @ physical
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-kirkwood/include/mach/debug-macro.S
View File

@ -15,5 +15,4 @@
orr \rv, \rv, #0x00012000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-lpc32xx/include/mach/debug-macro.S
View File

@ -25,5 +25,4 @@
ldrne \rv, =0xF4090000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-mv78xx0/include/mach/debug-macro.S
View File

@ -15,5 +15,4 @@
orr \rv, \rv, #0x00012000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-orion5x/include/mach/debug-macro.S
View File

@ -17,5 +17,4 @@
orr \rv, \rv, #0x00012000
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>

1
arch/arm/mach-rpc/include/mach/debug-macro.S
View File

@ -18,5 +18,4 @@
orr \rp, \rp, #0x03000000 @ physical
.endm
#define UART_SHIFT 2
#include <asm/hardware/debug-8250.S>