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

Commit 5f58c970 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: move debug-macro.S into the common space 



Move debug-macro.S from include/mach/ to include/debug where all other common
debug macros are.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 415c9474

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -877,6 +877,7 @@ F: arch/arm/boot/dts/at91*.dts 
F:	arch/arm/boot/dts/at91*.dtsi

F:	arch/arm/boot/dts/sama*.dts

F:	arch/arm/boot/dts/sama*.dtsi

F:	arch/arm/include/debug/at91.S



ARM/ATMEL AT91 Clock Support

M:	Boris Brezillon <boris.brezillon@free-electrons.com>

arch/arm/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -115,15 +115,18 @@ choice 
		    0x80024000      | 0xf0024000     | UART9



	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263 and 9g45"

		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU1



	config AT91_DEBUG_LL_DBGU2

		bool "Kernel low-level debugging on sama5d4"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU2



	config DEBUG_BCM2835
@@ -1165,6 +1168,8 @@ config DEBUG_LL_INCLUDE 
	string

	default "debug/sa1100.S" if DEBUG_SA1100

	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250

	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \

				AT91_DEBUG_LL_DBGU2

	default "debug/asm9260.S" if DEBUG_ASM9260_UART

	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2

	default "debug/meson.S" if DEBUG_MESON_UARTAO

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

+11 −8
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/debug-macro.S

 *

 *  Copyright (C) 2003-2005 SAN People

 *

 * Debugging macro include header
@@ -11,18 +9,23 @@ 
 *

*/



#include <mach/hardware.h>

#include <mach/at91_dbgu.h>



#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)

#define AT91_DBGU AT91_BASE_DBGU0

#define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */

#elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)

#define AT91_DBGU AT91_BASE_DBGU1

#define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */

#else

/* On sama5d4, use USART3 as low level serial console */

#define AT91_DBGU SAMA5D4_BASE_USART3

#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */

#endif



/* Keep in sync with mach-at91/include/mach/hardware.h */

#define AT91_IO_P2V(x) ((x) - 0x01000000)



#define AT91_DBGU_SR		(0x14)	/* Status Register */

#define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */

#define AT91_DBGU_TXRDY		(1 << 1)	/* Transmitter Ready */

#define AT91_DBGU_TXEMPTY	(1 << 9)	/* Transmitter Empty */



	.macro	addruart, rp, rv, tmp

	ldr	\rp, =AT91_DBGU				@ System peripherals (phys address)

	ldr	\rv, =AT91_IO_P2V(AT91_DBGU)		@ System peripherals (virt address)