From patchwork Thu May 30 04:40:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 2633671 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E782FDF2A1 for ; Thu, 30 May 2013 04:54:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751066Ab3E3Eyc (ORCPT ); Thu, 30 May 2013 00:54:32 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:47016 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863Ab3E3Eyb (ORCPT ); Thu, 30 May 2013 00:54:31 -0400 Received: by mail-pd0-f182.google.com with SMTP id g10so9971935pdj.27 for ; Wed, 29 May 2013 21:54:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=YcwERqGFHg8QqEKNqgpHZFa0XiRC88nlaCcHJ0l/fw8=; b=W0t9l2KsUGmUTOCTJstGe50HHu68JxI8eJIQRZfd0vBn4lAwmb2v01HbYWmgrYFfYJ IbIUnqFUpBbz1EsjwuFvO+D4j5Q5GZ5j6RYE/TxSr862sYeXYeN4wvXb/J5USaNrBTT0 AwCaLemPzwgJmQD0Q0XDSEIVDKjbBxDpO8YDQHoCPoqeeCGrQFVld5VteR1Av8d6XJzp h1sVI7pfY3GMB9ClpU/bGDk52ral4MmvXnR1SO6lU9Mk6XDjM/IgLTnLOqWcnq2mHz5m Mru5eDMhbC8ia5yEWtmorF1LMq/7uu9EbCzxvAhl5wtBluc6X6KH3LSWNjozywMUPmQV a1pw== X-Received: by 10.68.37.100 with SMTP id x4mr6034740pbj.122.1369889670318; Wed, 29 May 2013 21:54:30 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id vz8sm42867993pac.20.2013.05.29.21.54.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 May 2013 21:54:29 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: arnd@arndb.de, patches@linaro.org, kgene.kim@samsung.com, olof@lixom.net Subject: [PATCH] ARM: EXYNOS: Consolidate multiple low-level UART port definitions Date: Thu, 30 May 2013 10:10:27 +0530 Message-Id: <1369888827-9427-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQltzXJp2/b/zwJpI8aukCpQecGaZmsHTdF91IEU/pgeGynjUbNNpjQftp/ns+fF/ix0Ldfh Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org There are two definitions for low-level UART ports for Exynos platform. CONFIG_S3C_LOWLEVEL_UART_PORT is used for printing "Uncompressing Linux... done, booting the kernel." and CONFIG_S3C_UART for other low-level messages. The assumption for both the uart ports is that they are pre-configured in the bootloader. Since they are essentially the same always, it would be good to consolidate them to use only one macro, in this case 'DEBUG_S3C_UART' would be a better option. 'DEBUG_S3C_UART' is defined only if DEBUG_LL is enabled. We can safely disable this option when DEBUG_LL is not defined and we can boot various boards with different UART port settings. Only drawback of this approach is that when DEBUG_LL is not defined, we would be missing the print "Uncompressing Linux... done, booting the kernel." Since CONFIG_S3C_LOWLEVEL_UART_PORT is still used by other Samsung boards, the consolidation applies only for ARCH_EXYNOS. Signed-off-by: Tushar Behera Acked-by: Kevin Hilman --- arch/arm/mach-exynos/include/mach/uncompress.h | 11 ++++++++--- arch/arm/plat-samsung/include/plat/uncompress.h | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h index 2979995..45b5c2a 100644 --- a/arch/arm/mach-exynos/include/mach/uncompress.h +++ b/arch/arm/mach-exynos/include/mach/uncompress.h @@ -37,11 +37,16 @@ static void arch_detect_cpu(void) chip_id >>= 20; chip_id &= 0xf; +#ifdef CONFIG_DEBUG_LL if (chip_id == 0x5) - uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); + uart_base = (volatile u8 *)EXYNOS5_PA_UART + + (S3C_UART_OFFSET * CONFIG_DEBUG_S3C_UART); else - uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); - + uart_base = (volatile u8 *)EXYNOS4_PA_UART + + (S3C_UART_OFFSET * CONFIG_DEBUG_S3C_UART); +#else + uart_base = 0; +#endif /* * For preventing FIFO overrun or infinite loop of UART console, * fifo_max should be the minimum fifo size of all of the UART channels diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index 438b248..028c2a8 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h @@ -38,7 +38,11 @@ static void arch_detect_cpu(void); #define FIFO_MAX (14) #ifdef S3C_PA_UART -#define uart_base S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT) +#ifdef CONFIG_DEBUG_LL +#define uart_base (S3C_PA_UART + (S3C_UART_OFFSET * CONFIG_DEBUG_S3C_UART)) +#else +#define uart_base 0 +#endif #endif static __inline__ void @@ -66,6 +70,9 @@ uart_rd(unsigned int reg) static void putc(int ch) { + if (!uart_base) + return; + if (uart_rd(S3C2410_UFCON) & S3C2410_UFCON_FIFOMODE) { int level; @@ -118,7 +125,12 @@ static void arch_decomp_error(const char *x) #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO static inline void arch_enable_uart_fifo(void) { - u32 fifocon = uart_rd(S3C2410_UFCON); + u32 fifocon; + + if (!uart_base) + return; + + fifocon = uart_rd(S3C2410_UFCON); if (!(fifocon & S3C2410_UFCON_FIFOMODE)) { fifocon |= S3C2410_UFCON_RESETBOTH;