From patchwork Fri Jul 26 17:04:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 2834274 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 326C0C0319 for ; Fri, 26 Jul 2013 17:06:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E38CC2021F for ; Fri, 26 Jul 2013 17:06:49 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 989FB2021C for ; Fri, 26 Jul 2013 17:06:48 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2lTH-0003gY-De; Fri, 26 Jul 2013 17:06:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2lT7-0001Wn-VG; Fri, 26 Jul 2013 17:06:18 +0000 Received: from mail1.bemta7.messagelabs.com ([216.82.254.97]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2lT5-0001Uf-5c for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2013 17:06:15 +0000 Received: from [216.82.255.3:28480] by server-1.bemta-7.messagelabs.com id D4/4A-07829-F6CA2F15; Fri, 26 Jul 2013 17:05:51 +0000 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-12.tower-209.messagelabs.com!1374858351!6129604!1 X-Originating-IP: [216.166.12.7] X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29236 invoked from network); 26 Jul 2013 17:05:51 -0000 Received: from unknown (HELO out001.collaborationhost.net) (216.166.12.7) by server-12.tower-209.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jul 2013 17:05:51 -0000 Received: from AUSP01VMBX24.collaborationhost.net ([10.2.12.1]) by AUSP01MHUB52.collaborationhost.net ([10.2.69.71]) with mapi; Fri, 26 Jul 2013 12:05:51 -0500 From: H Hartley Sweeten To: H Hartley Sweeten , ARM Kernel Date: Fri, 26 Jul 2013 12:04:10 -0500 Subject: RE: [PATCH] ARM: debug: use generic option for ep93xx PL10x debug port Thread-Topic: [PATCH] ARM: debug: use generic option for ep93xx PL10x debug port Thread-Index: Ac6DFmX9SKurKDjsSfe+Z5oIog7SMwHC6R5g Message-ID: References: <201307171048.17430.hartleys@visionengravers.com> In-Reply-To: <201307171048.17430.hartleys@visionengravers.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130726_130615_312463_4AA6B064 X-CRM114-Status: GOOD ( 15.42 ) X-Spam-Score: -2.6 (--) Cc: Russell King , Ryan Mallon 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Russell, Ping... Any comments on this? Thanks, Hartley -----Original Message----- From: linux-arm-kernel [mailto:linux-arm-kernel-bounces@lists.infradead.org] On Behalf Of H Hartley Sweeten Sent: Wednesday, July 17, 2013 10:48 AM To: ARM Kernel Cc: Russell King; Ryan Mallon Subject: [PATCH] ARM: debug: use generic option for ep93xx PL10x debug port The generic option DEBUG_LL_UART_PL01X is now used to select the UART type for the kernel low-level debugging on the ep93xx platform. This enables two config options to provide the physical and virtual base address of the debug UART. Use the generic options instead of providing platform specific options to select the debug UART. UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000 DEBUG_UART_VIRT = 0xfedc0000 UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000 DEBUG_UART_VIRT = 0xfedd0000 UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000 DEBUG_UART_VIRT = 0xfede0000 The selected UART must already be initialized by the bootloader. If it isn't setup nothing will appear (which might be desired). Signed-off-by: H Hartley Sweeten Cc: Russell King Cc: Ryan Mallon --- This applies on top of Russell King's "Clean up the debugging support". arch/arm/mach-ep93xx/Kconfig | 14 -------------- arch/arm/mach-ep93xx/include/mach/uncompress.h | 14 ++------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index fe3c1fa..93e54fd 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig @@ -194,20 +194,6 @@ config MACH_VISION_EP9307 Say 'Y' here if you want your kernel to support the Vision Engraving Systems EP9307 SoM. -choice - prompt "Select a UART for early kernel messages" - -config EP93XX_EARLY_UART1 - bool "UART1" - -config EP93XX_EARLY_UART2 - bool "UART2" - -config EP93XX_EARLY_UART3 - bool "UART3" - -endchoice - endmenu endif diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index b5cc77d..03c42e5 100644 --- a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr) *((volatile unsigned int *)ptr) = value; } -#if defined(CONFIG_EP93XX_EARLY_UART1) -#define UART_BASE EP93XX_UART1_PHYS_BASE -#elif defined(CONFIG_EP93XX_EARLY_UART2) -#define UART_BASE EP93XX_UART2_PHYS_BASE -#elif defined(CONFIG_EP93XX_EARLY_UART3) -#define UART_BASE EP93XX_UART3_PHYS_BASE -#else -#define UART_BASE EP93XX_UART1_PHYS_BASE -#endif - -#define PHYS_UART_DATA (UART_BASE + 0x00) -#define PHYS_UART_FLAG (UART_BASE + 0x18) +#define PHYS_UART_DATA (CONFIG_DEBUG_UART_PHYS + 0x00) +#define PHYS_UART_FLAG (CONFIG_DEBUG_UART_PHYS + 0x18) #define UART_FLAG_TXFF 0x20 static inline void putc(int c)