From: daniel.thompson@linaro.org (Daniel Thompson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v12 10/15] arm: ks8695: Migrate debug_ll macros to shared directory
Date: Fri, 24 Oct 2014 11:54:31 +0100 [thread overview]
Message-ID: <1414148076-12685-11-git-send-email-daniel.thompson@linaro.org> (raw)
In-Reply-To: <1414148076-12685-1-git-send-email-daniel.thompson@linaro.org>
As part of the migration a couple of uart definitions have been copied
from of the platform specific header files.
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
---
arch/arm/Kconfig.debug | 8 ++++++++
.../include/mach/debug-macro.S => include/debug/ks8695.S} | 10 +++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5881c94..c8f623c 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -365,6 +365,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
@@ -1050,6 +1057,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/s3c24xx.S" if DEBUG_S3C24XX_UART
diff --git a/arch/arm/mach-ks8695/include/mach/debug-macro.S b/arch/arm/include/debug/ks8695.S
similarity index 80%
rename from arch/arm/mach-ks8695/include/mach/debug-macro.S
rename to arch/arm/include/debug/ks8695.S
index a79e489..961da1f 100644
--- a/arch/arm/mach-ks8695/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/ks8695.S
@@ -1,5 +1,5 @@
/*
- * 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
--
1.9.3
next prev parent reply other threads:[~2014-10-24 10:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-24 10:54 [PATCH v12 00/15] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 01/15] arm: cnx3xxxx: Remove spurious default for DEBUG_CNS3XXX Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 02/15] arm: iop32x: Enable DEBUG_LL_UART_8250 Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 03/15] arm: iop33x: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 04/15] arm: ixp4xx: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 05/15] arm: lpc32xx: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 06/15] arm: mv78xx0: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 07/15] arm: orion5x: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 08/15] arm: rpc: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 09/15] arm: Remove DEBUG_LL_UART_NONE Daniel Thompson
2014-10-24 10:54 ` Daniel Thompson [this message]
2014-10-24 10:54 ` [PATCH v12 11/15] arm: omap1: Migrate debug_ll macros to use 8250.S Daniel Thompson
2014-11-16 0:29 ` Aaro Koskinen
2014-11-17 9:07 ` Daniel Thompson
2014-11-17 14:24 ` Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 12/15] arm: netx: Migrate DEBUG_LL macros to shared directory Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 13/15] arm: sa1100: " Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 14/15] arm: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX Daniel Thompson
2014-10-24 10:54 ` [PATCH v12 15/15] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) Daniel Thompson
2014-10-24 15:46 ` [PATCH v12 00/15] " Arnd Bergmann
2014-11-12 14:48 ` Daniel Thompson
2015-01-23 13:05 ` Geert Uytterhoeven
2015-01-23 13:08 ` Russell King - ARM Linux
2015-01-23 13:28 ` Arnd Bergmann
2015-01-23 17:14 ` Tony Lindgren
2015-01-23 13:31 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414148076-12685-11-git-send-email-daniel.thompson@linaro.org \
--to=daniel.thompson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).