ARM: debug: Use generic 8250 debug_ll for ti81xx
We want to use generic 8250 debug_ll code to get DEBUG_UNCOMPRESS working and to simplify the code. The old debug_ll code is no longer needed and the machine ID based detection is no longer used. Note that for most part there's no need to keep DEBUG_LL enabled. We now have CONFIG_SERIAL_EARLYCON working very early as long as the kernel cmdline has "earlycon" in it and the board specific dts file has chosen configured with with the port using stdout-path. Cc: Hoeun Ryu <hoeun.ryu@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
fc23beb8a5
commit
2d1f7d2e24
|
@ -712,17 +712,17 @@ choice
|
||||||
config DEBUG_TI81XXUART1
|
config DEBUG_TI81XXUART1
|
||||||
bool "Kernel low-level debugging messages via TI81XX UART1 (ti8148evm)"
|
bool "Kernel low-level debugging messages via TI81XX UART1 (ti8148evm)"
|
||||||
depends on ARCH_OMAP2PLUS
|
depends on ARCH_OMAP2PLUS
|
||||||
select DEBUG_OMAP2PLUS_UART
|
select DEBUG_UART_8250
|
||||||
|
|
||||||
config DEBUG_TI81XXUART2
|
config DEBUG_TI81XXUART2
|
||||||
bool "Kernel low-level debugging messages via TI81XX UART2"
|
bool "Kernel low-level debugging messages via TI81XX UART2"
|
||||||
depends on ARCH_OMAP2PLUS
|
depends on ARCH_OMAP2PLUS
|
||||||
select DEBUG_OMAP2PLUS_UART
|
select DEBUG_UART_8250
|
||||||
|
|
||||||
config DEBUG_TI81XXUART3
|
config DEBUG_TI81XXUART3
|
||||||
bool "Kernel low-level debugging messages via TI81XX UART3 (ti8168evm)"
|
bool "Kernel low-level debugging messages via TI81XX UART3 (ti8168evm)"
|
||||||
depends on ARCH_OMAP2PLUS
|
depends on ARCH_OMAP2PLUS
|
||||||
select DEBUG_OMAP2PLUS_UART
|
select DEBUG_UART_8250
|
||||||
|
|
||||||
config DEBUG_AM33XXUART1
|
config DEBUG_AM33XXUART1
|
||||||
bool "Kernel low-level debugging messages via AM33XX UART1"
|
bool "Kernel low-level debugging messages via AM33XX UART1"
|
||||||
|
@ -1523,7 +1523,9 @@ config DEBUG_UART_PHYS
|
||||||
default 0x40090000 if DEBUG_LPC32XX
|
default 0x40090000 if DEBUG_LPC32XX
|
||||||
default 0x40100000 if DEBUG_PXA_UART1
|
default 0x40100000 if DEBUG_PXA_UART1
|
||||||
default 0x42000000 if DEBUG_GEMINI
|
default 0x42000000 if DEBUG_GEMINI
|
||||||
default 0x48020000 if DEBUG_OMAP4UART3
|
default 0x48020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
||||||
|
default 0x48022000 if DEBUG_TI81XXUART2
|
||||||
|
default 0x48024000 if DEBUG_TI81XXUART3
|
||||||
default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
default 0x4806a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
||||||
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
||||||
default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
default 0x4806c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
||||||
|
@ -1649,7 +1651,9 @@ config DEBUG_UART_VIRT
|
||||||
default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
|
default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
|
||||||
default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU
|
default 0xf8ffee00 if DEBUG_AT91_SAM9263_DBGU
|
||||||
default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU
|
default 0xf8fff200 if DEBUG_AT91_RM9200_DBGU
|
||||||
default 0xfa020000 if DEBUG_OMAP4UART3
|
default 0xfa020000 if DEBUG_OMAP4UART3 || DEBUG_TI81XXUART1
|
||||||
|
default 0xfa022000 if DEBUG_TI81XXUART2
|
||||||
|
default 0xfa024000 if DEBUG_TI81XXUART3
|
||||||
default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
default 0xfa06a000 if DEBUG_OMAP2UART1 || DEBUG_OMAP3UART1 || \
|
||||||
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
DEBUG_OMAP4UART1 || DEBUG_OMAP5UART1
|
||||||
default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
default 0xfa06c000 if DEBUG_OMAP2UART2 || DEBUG_OMAP3UART2 || \
|
||||||
|
|
|
@ -15,11 +15,6 @@
|
||||||
/* OMAP3 serial ports */
|
/* OMAP3 serial ports */
|
||||||
#define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */
|
#define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */
|
||||||
|
|
||||||
/* TI81XX serial ports */
|
|
||||||
#define TI81XX_UART1_BASE 0x48020000
|
|
||||||
#define TI81XX_UART2_BASE 0x48022000
|
|
||||||
#define TI81XX_UART3_BASE 0x48024000
|
|
||||||
|
|
||||||
/* AM3505/3517 UART4 */
|
/* AM3505/3517 UART4 */
|
||||||
#define AM35XX_UART4_BASE 0x4809E000 /* Only on AM3505/3517 */
|
#define AM35XX_UART4_BASE 0x4809E000 /* Only on AM3505/3517 */
|
||||||
|
|
||||||
|
@ -56,18 +51,6 @@ omap_uart_lsr: .word 0
|
||||||
bne 100f @ already configured
|
bne 100f @ already configured
|
||||||
|
|
||||||
/* Configure the UART offset from the phys/virt base */
|
/* Configure the UART offset from the phys/virt base */
|
||||||
#ifdef CONFIG_DEBUG_TI81XXUART1
|
|
||||||
mov \rp, #UART_OFFSET(TI81XX_UART1_BASE)
|
|
||||||
b 98f
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DEBUG_TI81XXUART2
|
|
||||||
mov \rp, #UART_OFFSET(TI81XX_UART2_BASE)
|
|
||||||
b 98f
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DEBUG_TI81XXUART3
|
|
||||||
mov \rp, #UART_OFFSET(TI81XX_UART3_BASE)
|
|
||||||
b 98f
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DEBUG_AM33XXUART1
|
#ifdef CONFIG_DEBUG_AM33XXUART1
|
||||||
ldr \rp, =AM33XX_UART1_BASE
|
ldr \rp, =AM33XX_UART1_BASE
|
||||||
and \rp, \rp, #0x00ffffff
|
and \rp, \rp, #0x00ffffff
|
||||||
|
@ -94,17 +77,6 @@ omap_uart_lsr: .word 0
|
||||||
|
|
||||||
b 10b
|
b 10b
|
||||||
|
|
||||||
/* Store both phys and virt address for the uart */
|
|
||||||
98: add \rp, \rp, #0x48000000 @ phys base
|
|
||||||
str \rp, [\tmp, #0] @ omap_uart_phys
|
|
||||||
sub \rp, \rp, #0x48000000 @ phys base
|
|
||||||
add \rp, \rp, #0xfa000000 @ virt base
|
|
||||||
str \rp, [\tmp, #4] @ omap_uart_virt
|
|
||||||
mov \rp, #(UART_LSR << OMAP_PORT_SHIFT)
|
|
||||||
str \rp, [\tmp, #8] @ omap_uart_lsr
|
|
||||||
|
|
||||||
b 10b
|
|
||||||
|
|
||||||
.align
|
.align
|
||||||
99: .word .
|
99: .word .
|
||||||
.word omap_uart_phys
|
.word omap_uart_phys
|
||||||
|
|
Loading…
Reference in New Issue