From patchwork Wed Jan 9 13:44:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffen Trumtrar X-Patchwork-Id: 1952811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D174A3FC5A for ; Wed, 9 Jan 2013 13:48:48 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tsvy2-0000uo-Ad; Wed, 09 Jan 2013 13:45:18 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tsvxh-0000ld-UP for linux-arm-kernel@lists.infradead.org; Wed, 09 Jan 2013 13:44:59 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Tsvxc-0007hg-Ui; Wed, 09 Jan 2013 14:44:52 +0100 Received: from str by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1Tsvxc-0004AG-Hk; Wed, 09 Jan 2013 14:44:52 +0100 From: Steffen Trumtrar To: linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCH 1/4] ARM i.MX53: Add UART2 for low-level debugging Date: Wed, 9 Jan 2013 14:44:22 +0100 Message-Id: <1357739065-9153-2-git-send-email-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357739065-9153-1-git-send-email-s.trumtrar@pengutronix.de> References: <1357739065-9153-1-git-send-email-s.trumtrar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: str@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130109_084458_636034_C92E82F7 X-CRM114-Status: GOOD ( 13.97 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Sascha Hauer , Shawn Guo , Russell King , Philipp Zabel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Philipp Zabel This is needed for boards like the Garz & Fricke Vincell and Vincell LT, that have the serial debugging console on UART2. Signed-off-by: Philipp Zabel --- arch/arm/Kconfig.debug | 10 ++++++++++ arch/arm/include/debug/imx.S | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 661030d..8e84a24 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -450,6 +450,16 @@ choice endchoice +config DEBUG_IMX50_IMX53_UART_PORT + int "i.MX50 and i.MX53 Debug UART Port (1-2)" if DEBUG_IMX50_IMX53_UART + range 1 2 + default 1 + depends on SOC_IMX50 || SOC_IMX53 + help + Choose UART port on which kernel low-level debug messages + should be output. The default choice (UART1) is correct for + e.g. the Freescale i.MX53 Quick Start Board. + config DEBUG_IMX6Q_UART_PORT int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART range 1 5 diff --git a/arch/arm/include/debug/imx.S b/arch/arm/include/debug/imx.S index 0c4e17d..4069ea0 100644 --- a/arch/arm/include/debug/imx.S +++ b/arch/arm/include/debug/imx.S @@ -10,12 +10,17 @@ * published by the Free Software Foundation. * */ +#define IMX50_IMX53_UART1_BASE_ADDR 0x53fbc000 +#define IMX50_IMX53_UART2_BASE_ADDR 0x53fc0000 #define IMX6Q_UART1_BASE_ADDR 0x02020000 #define IMX6Q_UART2_BASE_ADDR 0x021e8000 #define IMX6Q_UART3_BASE_ADDR 0x021ec000 #define IMX6Q_UART4_BASE_ADDR 0x021f0000 #define IMX6Q_UART5_BASE_ADDR 0x021f4000 +#define IMX50_IMX53_UART_BASE_ADDR(n) IMX50_IMX53_UART##n##_BASE_ADDR +#define IMX50_IMX53_UART_BASE(n) IMX50_IMX53_UART_BASE_ADDR(n) +#define IMX50_IMX53_DEBUG_UART_BASE IMX50_IMX53_UART_BASE(CONFIG_DEBUG_IMX50_IMX53_UART_PORT) /* * IMX6Q_UART_BASE_ADDR is put in the middle to force the expansion * of IMX6Q_UART##n##_BASE_ADDR. @@ -35,7 +40,7 @@ #elif defined (CONFIG_DEBUG_IMX51_UART) #define UART_PADDR 0x73fbc000 #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) -#define UART_PADDR 0x53fbc000 +#define UART_PADDR IMX50_IMX53_DEBUG_UART_BASE #elif defined (CONFIG_DEBUG_IMX6Q_UART) #define UART_PADDR IMX6Q_DEBUG_UART_BASE #endif