Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d31e664 authored by Daniel Thompson's avatar Daniel Thompson Committed by Russell King
Browse files

ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory 



As part of the migration we introduce DEBUG_UART_PHYS/DEBUG_UART_VIRT
which default to UART1 but allow a user to configure UART2 or UART3.
We also introduce symbolic names for the registers and flags.

Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Acked-by: default avatarArnd Bergmann <arnd.bergmann@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c26b9993

arch/arm/Kconfig.debug

+14 −2
Original line number Diff line number Diff line
@@ -503,6 +503,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on Vybrid based platforms.



	config DEBUG_NETX_UART

		bool "Kernel low-level debugging messages via NetX UART"

		depends on ARCH_NETX

		help

		  Say Y here if you want kernel low-level debugging support

		  on Hilscher NetX based platforms.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK
@@ -1231,6 +1238,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6SX_UART

	default "debug/ks8695.S" if DEBUG_KS8695_UART

	default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM

	default "debug/netx.S" if DEBUG_NETX_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
@@ -1276,6 +1284,7 @@ config DEBUG_UART_BCM63XX 


config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	default 0x00100a00 if DEBUG_NETX_UART

	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0

	default 0x01c28000 if DEBUG_SUNXI_UART0

	default 0x01c28400 if DEBUG_SUNXI_UART1
@@ -1364,7 +1373,8 @@ config DEBUG_UART_PHYS 
	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_LL_UART_EFM32 || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_MSM_UART || DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \

		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \

		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
@@ -1373,6 +1383,7 @@ config DEBUG_UART_PHYS 


config DEBUG_UART_VIRT

	hex "Virtual base address of debug UART"

	default 0xe0000a00 if DEBUG_NETX_UART

	default 0xe0010fe0 if ARCH_RPC

	default 0xe1000000 if DEBUG_MSM_UART

	default 0xf0000be0 if ARCH_EBSA110
@@ -1449,7 +1460,8 @@ config DEBUG_UART_VIRT 
	default DEBUG_UART_PHYS if !MMU

	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_MSM_UART || DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART



config DEBUG_UART_8250_SHIFT

arch/arm/mach-netx/include/mach/debug-macro.S→arch/arm/include/debug/netx.S

+11 −11
Original line number Diff line number Diff line 
/* arch/arm/mach-netx/include/mach/debug-macro.S

 *

/*

 * Debugging macro include header

 *

 *  Copyright (C) 1994-1999 Russell King
@@ -11,26 +10,27 @@ 
 *

*/



#include "hardware.h"

#define UART_DATA 0

#define UART_FLAG 0x18

#define UART_FLAG_BUSY (1 << 3)



		.macro	addruart, rp, rv, tmp

		mov	\rp, #0x00000a00

		orr	\rv, \rp, #io_p2v(0x00100000)	@ virtual

		orr	\rp, \rp, #0x00100000		@ physical

		ldr	\rp, =CONFIG_DEBUG_UART_PHYS

		ldr	\rv, =CONFIG_DEBUG_UART_VIRT

		.endm



		.macro	senduart,rd,rx

		str	\rd, [\rx, #0]

		str	\rd, [\rx, #UART_DATA]

		.endm



		.macro	busyuart,rd,rx

1002:		ldr	\rd, [\rx, #0x18]

		tst	\rd, #(1 << 3)

1002:		ldr	\rd, [\rx, #UART_FLAG]

		tst	\rd, #UART_FLAG_BUSY

		bne	1002b

		.endm



		.macro	waituart,rd,rx

1001:		ldr	\rd, [\rx, #0x18]

		tst	\rd, #(1 << 3)

1001:		ldr	\rd, [\rx, #UART_FLAG]

		tst	\rd, #UART_FLAG_BUSY

		bne	1001b

		.endm