From patchwork Thu Nov 6 07:20:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5239481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8B638C11AC for ; Thu, 6 Nov 2014 07:23:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89A3420117 for ; Thu, 6 Nov 2014 07:23:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B590720115 for ; Thu, 6 Nov 2014 07:23:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmHNH-0001yP-07; Thu, 06 Nov 2014 07:20:55 +0000 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmHNE-0001xr-CF for linux-arm-kernel@lists.infradead.org; Thu, 06 Nov 2014 07:20:53 +0000 Received: by mail-wi0-f177.google.com with SMTP id ex7so558553wid.16 for ; Wed, 05 Nov 2014 23:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=o/MfLxTQr1tXGw+OITPPWy5ZNTcqRtsZRGyCTPtsFDM=; b=Xgw/ZMh/mVXgJBMcRWDKObn+4nfbs5E/+tIwL4VhzU6fHa7R2F8RwJWifbX5wAWf5e As9aB2XgXskdtiFI0OyiXW+cIVuhVS5k6tzAgV8e9rDtdYz2QTqPktIk84nD2HtDxreJ LM8coluOkKB01Cetyc1LSljaa9vPzcRFWYFNZfTIG/lx6tD8qU3QTTatDfRVuwbS5CSt PhpLkdaoMqn653YaSr7q5K8AqB9k6P+78P6lUFFhpSZoLWFF/3yVjegPERPukEAvymkY NZZTmuQXKHMqHHXnZ83hg/385edWPwgrTKFHopQH1g6P+jrZUXuPWJ2sy7fvPUMz/tBd 05TQ== X-Received: by 10.180.12.136 with SMTP id y8mr38783482wib.73.1415258430029; Wed, 05 Nov 2014 23:20:30 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id mw7sm7172978wib.14.2014.11.05.23.20.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Nov 2014 23:20:29 -0800 (PST) From: Dmitry Eremin-Solenikov To: Russell King Subject: [PATCH RESEND V2] ARM: debug: move StrongARM debug include to arch/arm/include/debug Date: Thu, 6 Nov 2014 10:20:23 +0300 Message-Id: <1415258423-17022-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141105_232052_710891_4BDB9FAE X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: -0.8 (/) Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP StrongARM debug-macro.S is quite standalone thing, depending only on register mappings. Move it to proper place and add Kconfig entry. Signed-off-by: Dmitry Eremin-Solenikov --- [Changes since V1: keep Kconfig.debug sorted alphabetically] arch/arm/Kconfig.debug | 9 +++++++++ .../include/mach/debug-macro.S => include/debug/sa1100.S} | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index b11ad54..9a3bff0 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -699,6 +699,14 @@ choice their output to UART 2. The port must have been initialised by the boot-loader before use. + config DEBUG_SA1100 + depends on ARCH_SA1100 + bool "Use SA1100 UARTs for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on SA-11x0 UART ports. The kernel will check for the first + enabled UART in a sequence 3-1-2. + config DEBUG_SOCFPGA_UART depends on ARCH_SOCFPGA bool "Use SOCFPGA UART for low-level debug" @@ -1009,6 +1017,7 @@ config DEBUG_STI_UART 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/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2 default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X diff --git a/arch/arm/mach-sa1100/include/mach/debug-macro.S b/arch/arm/include/debug/sa1100.S similarity index 83% rename from arch/arm/mach-sa1100/include/mach/debug-macro.S rename to arch/arm/include/debug/sa1100.S index 530772d..a0ae4f4 100644 --- a/arch/arm/mach-sa1100/include/mach/debug-macro.S +++ b/arch/arm/include/debug/sa1100.S @@ -1,4 +1,4 @@ -/* arch/arm/mach-sa1100/include/mach/debug-macro.S +/* arch/arm/include/debug/sa1100.S * * Debugging macro include header * @@ -10,7 +10,13 @@ * published by the Free Software Foundation. * */ -#include + +#define UTCR3 0x0c +#define UTDR 0x14 +#define UTSR1 0x20 +#define UTCR3_TXE 0x00000002 /* Transmit Enable */ +#define UTSR1_TBY 0x00000001 /* Transmitter BusY (read) */ +#define UTSR1_TNF 0x00000004 /* Transmit FIFO Not Full (read) */ .macro addruart, rp, rv, tmp mrc p15, 0, \rp, c1, c0