From patchwork Wed Mar 20 11:41:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2307041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 6403EDF24C for ; Wed, 20 Mar 2013 11:46:44 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIHQr-0005hE-FH; Wed, 20 Mar 2013 11:43:49 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIHOd-0004yq-EM for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2013 11:41:40 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0LrXBZ-1UhDKQ0LIz-013ARJ; Wed, 20 Mar 2013 12:41:23 +0100 From: Arnd Bergmann To: Barry Song Subject: [PATCH 5/8] ARM: sirf: move debug-macro.S to include/debug/sirf.S Date: Wed, 20 Mar 2013 12:41:16 +0100 Message-Id: <1363779679-16880-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363779679-16880-1-git-send-email-arnd@arndb.de> References: <1363779679-16880-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:pmrY22/iTz45RRDq3/sqAt3ZDn2BAO8kb+x1TlBMS1u PHECreu1L7ufxvwFW8cEVjrn6gUMlCoAkhpcg8ML05DlzDr3mI excAM+W2NBvNFYtFHQLZHAJy90VEICtS+ZOoefVgoTKyd/QE0Y Z3CsEE9dCZWun/uy1deREF82cQRZvw3epB1E/qWxAvTop9xqI+ uu/QaxauXSbKU7pqTQlVY2VYhDEhK5q9557lUbe7JJpga5nvjB ImckEx6HRBsyfaXZ+F5Ph7NvGXjxzmvkFGpuec/Ja/p56L9OYr 0oAUUjyBs6NcyvjcT6NaNAUByYyPrKnryeTGyPsK5jyDUfkxzZ IyB+k8SXmTje2T3/UKLS+6aVHOVX+guJywryEFrNN X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130320_074131_785695_66734FA3 X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: olof@lixom.net, Arnd Bergmann , workgroup.linux@csr.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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 The new style ll_debug implementation for multiplatform requires the platform glue to be in include/debug, so let's move it there to separate the debugging logic from the platform code. Signed-off-by: Arnd Bergmann Tested-by: Barry Song --- arch/arm/Kconfig.debug | 1 + .../include/mach/debug-macro.S => include/debug/sirf.S} | 17 +++++++++++++++-- arch/arm/mach-prima2/lluart.c | 12 +++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) rename arch/arm/{mach-prima2/include/mach/debug-macro.S => include/debug/sirf.S} (53%) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index acdddda..a69334d 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -592,6 +592,7 @@ config DEBUG_LL_INCLUDE default "debug/mvebu.S" if DEBUG_MVEBU_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART + default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ diff --git a/arch/arm/mach-prima2/include/mach/debug-macro.S b/arch/arm/include/debug/sirf.S similarity index 53% rename from arch/arm/mach-prima2/include/mach/debug-macro.S rename to arch/arm/include/debug/sirf.S index cd97492..dbf250c 100644 --- a/arch/arm/mach-prima2/include/mach/debug-macro.S +++ b/arch/arm/include/debug/sirf.S @@ -6,8 +6,21 @@ * Licensed under GPLv2 or later. */ -#include -#include +#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1) +#define SIRFSOC_UART1_PA_BASE 0xb0060000 +#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1) +#define SIRFSOC_UART1_PA_BASE 0xcc060000 +#else +#define SIRFSOC_UART1_PA_BASE 0 +#endif + +#define SIRFSOC_UART1_VA_BASE 0xFEC60000 + +#define SIRFSOC_UART_TXFIFO_STATUS 0x0114 +#define SIRFSOC_UART_TXFIFO_DATA 0x0118 + +#define SIRFSOC_UART1_TXFIFO_FULL (1 << 5) +#define SIRFSOC_UART1_TXFIFO_EMPTY (1 << 6) .macro addruart, rp, rv, tmp ldr \rp, =SIRFSOC_UART1_PA_BASE @ physical diff --git a/arch/arm/mach-prima2/lluart.c b/arch/arm/mach-prima2/lluart.c index a89f9b3..7222481 100644 --- a/arch/arm/mach-prima2/lluart.c +++ b/arch/arm/mach-prima2/lluart.c @@ -10,7 +10,17 @@ #include #include #include -#include + +#if defined(CONFIG_DEBUG_SIRFPRIMA2_UART1) +#define SIRFSOC_UART1_PA_BASE 0xb0060000 +#elif defined(CONFIG_DEBUG_SIRFMARCO_UART1) +#define SIRFSOC_UART1_PA_BASE 0xcc060000 +#else +#define SIRFSOC_UART1_PA_BASE 0 +#endif + +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) +#define SIRFSOC_UART1_SIZE SZ_4K void __init sirfsoc_map_lluart(void) {