From patchwork Thu Apr 8 13:43:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rabin Vincent X-Patchwork-Id: 71748 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id 537931051E73 for ; Thu, 8 Apr 2010 15:49:15 +0200 (CEST) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id EB136C913116 for ; Thu, 8 Apr 2010 15:49:13 +0200 (CEST) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.9) for (single-drop); Thu, 08 Apr 2010 15:49:13 +0200 (CEST) Received: from murder (svr19.m-online.net [192.168.3.147]) by backend2 (Cyrus v2.2.12) with LMTPA; Thu, 08 Apr 2010 15:47:27 +0200 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend3.pop.m-online.net (Cyrus v2.2.13) with LMTPA; Thu, 08 Apr 2010 15:47:26 +0200 Received: from scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) by mail.m-online.net (Postfix) with ESMTP id 5A1F520010F; Thu, 8 Apr 2010 15:47:26 +0200 (CEST) Received: from mxin-2.m-online.net ([192.168.1.21]) by scanner-3.m-online.net (scanner-3.m-online.net [192.168.1.20]) (amavisd-new, port 10026) with ESMTP id 13623-04; Thu, 8 Apr 2010 15:47:24 +0200 (CEST) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-2.m-online.net (Postfix) with ESMTP id 3955746C0B8; Thu, 8 Apr 2010 15:47:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 67CC6281DE; Thu, 8 Apr 2010 15:45:25 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 75PiLFzIJQNE; Thu, 8 Apr 2010 15:45:25 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A4F3281E6; Thu, 8 Apr 2010 15:44:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 12ED4281DA for ; Thu, 8 Apr 2010 15:44:46 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fsfSYRvrEmcY for ; Thu, 8 Apr 2010 15:44:44 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from eu1sys200aog111.obsmtp.com (eu1sys200aog111.obsmtp.com [207.126.144.131]) by theia.denx.de (Postfix) with ESMTPS id 0511A28173 for ; Thu, 8 Apr 2010 15:44:14 +0200 (CEST) Received: from source ([138.198.100.35]) (using TLSv1) by eu1sys200aob111.postini.com ([207.126.147.11]) with SMTP ID DSNKS73drd2XVz/BxQKZjED31Njxv21n/tzj@postini.com; Thu, 08 Apr 2010 13:44:16 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id D7C93FF for ; Thu, 8 Apr 2010 13:44:08 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id DF38A229 for ; Thu, 8 Apr 2010 13:43:56 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id AAF7AA8095 for ; Thu, 8 Apr 2010 15:44:01 +0200 (CEST) Received: from localhost (10.201.54.39) by exdcvycastm022.EQ1STM.local (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.1.393.1; Thu, 8 Apr 2010 15:44:07 +0200 From: Rabin Vincent To: Date: Thu, 8 Apr 2010 19:13:19 +0530 Message-ID: <1270734200-17762-13-git-send-email-rabin.vincent@stericsson.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270734200-17762-12-git-send-email-rabin.vincent@stericsson.com> References: <1270734200-17762-1-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-2-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-3-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-4-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-5-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-6-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-7-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-8-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-9-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-10-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-11-git-send-email-rabin.vincent@stericsson.com> <1270734200-17762-12-git-send-email-rabin.vincent@stericsson.com> MIME-Version: 1.0 Cc: STEricsson_nomadik_linux@list.st.com, Michael Brandt Subject: [U-Boot] [PATCHv2 12/13] pl01x: add support for Ux500 variant of pl011 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Virus-Scanned: by amavisd-new at m-online.net The Ux500 variants of the pl011 have separate LCRH registers for RX and TX. The TX register is at the same offset as the unmodified pl011, so we need to additionally program only the RX register. Acked-by: Michael Brandt Signed-off-by: Rabin Vincent --- drivers/serial/serial_pl01x.c | 8 ++++++++ drivers/serial/serial_pl01x.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index c645cef..c819f1d 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -144,6 +144,14 @@ int serial_init (void) IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH, (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN)); +#ifdef CONFIG_UX500 + /* + * On Ux500 variants, also set up the separate LCRH for RX. + */ + IO_WRITE (port[CONSOLE_PORT] + UART_PL011_LCRH_RX, + (UART_PL011_LCRH_WLEN_8 | UART_PL011_LCRH_FEN)); +#endif + /* ** Finally, enable the UART */ diff --git a/drivers/serial/serial_pl01x.h b/drivers/serial/serial_pl01x.h index 5f20fdd..0ff6203 100644 --- a/drivers/serial/serial_pl01x.h +++ b/drivers/serial/serial_pl01x.h @@ -93,6 +93,7 @@ * PL011 definitions * */ +#define UART_PL011_LCRH_RX 0x1C #define UART_PL011_IBRD 0x24 #define UART_PL011_FBRD 0x28 #define UART_PL011_LCRH 0x2C