From patchwork Sat Sep 29 00:30:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 187944 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id F3F0C2C00CE for ; Sat, 29 Sep 2012 10:37:11 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8FC2728105; Sat, 29 Sep 2012 02:36:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 tXZ3zHJrtE8p; Sat, 29 Sep 2012 02:36:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 635E1281A7; Sat, 29 Sep 2012 02:35:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 04A1128187 for ; Sat, 29 Sep 2012 02:32:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 IRPMHGG5-Bcb for ; Sat, 29 Sep 2012 02:32:07 +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 mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by theia.denx.de (Postfix) with ESMTPS id 7F65128106 for ; Sat, 29 Sep 2012 02:31:42 +0200 (CEST) Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3XT9g20ys6z3hhrp; Sat, 29 Sep 2012 02:31:42 +0200 (CEST) X-Auth-Info: EJOhYgf9n/wIDnVPg7yCDWDlIwyqwe+pNw9wpXIcvmg= Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3XT9g16MqZzbbh2; Sat, 29 Sep 2012 02:31:41 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Sat, 29 Sep 2012 02:30:41 +0200 Message-Id: <1348878687-14194-25-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348878687-14194-1-git-send-email-marex@denx.de> References: <1347837696-3192-1-git-send-email-marex@denx.de> <1348878687-14194-1-git-send-email-marex@denx.de> Cc: Marek Vasut , Tom Rini , Stefan Roese Subject: [U-Boot] [PATCH 24/70] serial: powerpc: Implement CONFIG_SERIAL_MULTI into mpc8220 serial driver X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Implement support for CONFIG_SERIAL_MULTI into mpc8220 serial driver. This driver was so far only usable directly, but this patch also adds support for the multi method. This allows using more than one serial driver alongside the mpc8220 driver. Also, add a weak implementation of default_serial_console() returning this driver. Signed-off-by: Marek Vasut Cc: Marek Vasut Cc: Tom Rini Cc: Anatolij Gustschin Cc: Stefan Roese --- arch/powerpc/cpu/mpc8220/uart.c | 67 +++++++++++++++++++++++++++++++++++---- common/serial.c | 2 ++ 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/cpu/mpc8220/uart.c b/arch/powerpc/cpu/mpc8220/uart.c index 0c4b536..545c81a 100644 --- a/arch/powerpc/cpu/mpc8220/uart.c +++ b/arch/powerpc/cpu/mpc8220/uart.c @@ -29,13 +29,15 @@ #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; #define PSC_BASE MMAP_PSC1 #if defined(CONFIG_PSC_CONSOLE) -int serial_init (void) +static int mpc8220_serial_init(void) { volatile psc8220_t *psc = (psc8220_t *) PSC_BASE; u32 counter; @@ -69,7 +71,7 @@ int serial_init (void) return (0); } -void serial_putc (const char c) +static void mpc8220_serial_putc(const char c) { volatile psc8220_t *psc = (psc8220_t *) PSC_BASE; @@ -82,14 +84,14 @@ void serial_putc (const char c) psc->xmitbuf[0] = c; } -void serial_puts (const char *s) +static void mpc8220_serial_puts(const char *s) { while (*s) { serial_putc (*s++); } } -int serial_getc (void) +static int mpc8220_serial_getc(void) { volatile psc8220_t *psc = (psc8220_t *) PSC_BASE; @@ -98,14 +100,14 @@ int serial_getc (void) return psc->xmitbuf[2]; } -int serial_tstc (void) +static int mpc8220_serial_tstc(void) { volatile psc8220_t *psc = (psc8220_t *) PSC_BASE; return (psc->sr_csr & PSC_SR_RXRDY); } -void serial_setbrg (void) +static void mpc8220_serial_setbrg(void) { volatile psc8220_t *psc = (psc8220_t *) PSC_BASE; u32 counter; @@ -123,4 +125,57 @@ void serial_setbrg (void) psc->cr = PSC_CR_RX_ENABLE | PSC_CR_TX_ENABLE; } + +#ifdef CONFIG_SERIAL_MULTI +static struct serial_device mpc8220_serial_drv = { + .name = "mpc8220_serial", + .start = mpc8220_serial_init, + .stop = NULL, + .setbrg = mpc8220_serial_setbrg, + .putc = mpc8220_serial_putc, + .puts = mpc8220_serial_puts, + .getc = mpc8220_serial_getc, + .tstc = mpc8220_serial_tstc, +}; + +void mpc8220_serial_initialize(void) +{ + serial_register(&mpc8220_serial_drv); +} + +__weak struct serial_device *default_serial_console(void) +{ + return &mpc8220_serial_drv; +} +#else +int serial_init(void) +{ + return mpc8220_serial_init(); +} + +void serial_setbrg(void) +{ + mpc8220_serial_setbrg(); +} + +void serial_putc(const char c) +{ + mpc8220_serial_putc(c); +} + +void serial_puts(const char *s) +{ + mpc8220_serial_puts(s); +} + +int serial_getc(void) +{ + return mpc8220_serial_getc(); +} + +int serial_tstc(void) +{ + return mpc8220_serial_tstc(); +} +#endif #endif /* CONFIG_PSC_CONSOLE */ diff --git a/common/serial.c b/common/serial.c index 69fa583..db06f97 100644 --- a/common/serial.c +++ b/common/serial.c @@ -53,6 +53,7 @@ serial_initfunc(au1x00_serial_initialize); serial_initfunc(asc_serial_initialize); serial_initfunc(jz_serial_initialize); serial_initfunc(mpc5xx_serial_initialize); +serial_initfunc(mpc8220_serial_initialize); void serial_register(struct serial_device *dev) { @@ -84,6 +85,7 @@ void serial_initialize(void) asc_serial_initialize(); jz_serial_initialize(); mpc5xx_serial_initialize(); + mpc8220_serial_initialize(); serial_assign(default_serial_console()->name); }