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

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

ARM: 8270/1: ks8695: Migrate debug_ll macros to shared directory 



As part of the migration a couple of uart definitions have been copied
from of the platform specific header files.

Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6f519455

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -397,6 +397,13 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to UART1 serial port on KEYSTONE2 devices.



	config DEBUG_KS8695_UART

		bool "KS8695 Debug UART"

		depends on ARCH_KS8695

		help

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

		  on KS8695.



	config DEBUG_MESON_UARTAO

		bool "Kernel low-level debugging via Meson6 UARTAO"

		depends on ARCH_MESON
@@ -1174,6 +1181,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6Q_UART || \

				 DEBUG_IMX6SL_UART || \

				 DEBUG_IMX6SX_UART

	default "debug/ks8695.S" if DEBUG_KS8695_UART

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

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

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

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

+7 −3
Original line number Diff line number Diff line 
/*

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

 * arch/arm/include/debug/ks8695.S

 *

 * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>

 * Copyright (C) 2006 Simtec Electronics
@@ -11,8 +11,12 @@ 
 * published by the Free Software Foundation.

 */



#include <mach/hardware.h>

#include <mach/regs-uart.h>

#define KS8695_UART_PA	0x03ffe000

#define KS8695_UART_VA	0xf00fe000

#define KS8695_URTH	(0x04)

#define KS8695_URLS	(0x14)

#define URLS_URTE	(1 << 6)

#define URLS_URTHRE	(1 << 5)



	.macro	addruart, rp, rv, tmp

		ldr	\rp, =KS8695_UART_PA		@ physical base address