From patchwork Sat Sep 29 21:52:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 188076 X-Patchwork-Delegate: trini@ti.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 C8DAF2C00F1 for ; Sun, 30 Sep 2012 07:56:30 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4553528295; Sat, 29 Sep 2012 23:56:29 +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 Tl-QqpDiS0e3; Sat, 29 Sep 2012 23:56:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 18FB5281E8; Sat, 29 Sep 2012 23:53:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 591C728200 for ; Sat, 29 Sep 2012 23:53:20 +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 Zujv6tTyEzob for ; Sat, 29 Sep 2012 23:53:20 +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.9]) by theia.denx.de (Postfix) with ESMTPS id 6DDE6281E8 for ; Sat, 29 Sep 2012 23:53:16 +0200 (CEST) Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3XTk5k5ZnNz4KK6B; Sat, 29 Sep 2012 23:53:14 +0200 (CEST) X-Auth-Info: VOelFmrlLzzJHY0X/UG7oPx319QPrP/+EIJnIw2umUw= Received: from mashiro.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3XTk5k44rrzbbfv; Sat, 29 Sep 2012 23:53:14 +0200 (CEST) From: Marek Vasut To: u-boot@lists.denx.de Date: Sat, 29 Sep 2012 23:52:05 +0200 Message-Id: <1348955586-7109-13-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348955586-7109-1-git-send-email-marex@denx.de> References: <1348878687-14194-1-git-send-email-marex@denx.de> <1348955586-7109-1-git-send-email-marex@denx.de> Cc: Marek Vasut , Tom Rini Subject: [U-Boot] [PATCH 12/72] serial: s5p: Move serial registration from serial_initialize() 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 Move the registration of s5p_serialN_device ports from default serial_initialize() into driver specific function called from serial_initialize(). This slims down the serial_initialize() call to a bare tracker of all possible serial port registration routines in U-Boot. The newly implemented s5p_serial_initialize() function, which is implemented inside of the serial_s5p driver allows encapsulation of s5p_serialN_device within the serial_s5p driver itself. Also, remove the exports of s5p_serialN_device from include/serial.h as they are no longer needed. This is simply because the implementation of default_serial_console() is wrapped into the serial_s5p driver and the default console is picked by CONFIG_SERIAL macro in config file. Signed-off-by: Marek Vasut Cc: Marek Vasut Cc: Tom Rini Cc: Minkyu Kang --- common/serial.c | 8 ++------ drivers/serial/serial_s5p.c | 8 ++++++++ include/serial.h | 7 ------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/common/serial.c b/common/serial.c index d457d23..c021c3f 100644 --- a/common/serial.c +++ b/common/serial.c @@ -43,6 +43,7 @@ static void serial_null(void) serial_initfunc(mpc8xx_serial_initialize); serial_initfunc(pxa_serial_initialize); serial_initfunc(s3c24xx_serial_initialize); +serial_initfunc(s5p_serial_initialize); void serial_register(struct serial_device *dev) { @@ -78,12 +79,7 @@ void serial_initialize(void) #endif /* CONFIG_SYS_NS16550_SERIAL */ pxa_serial_initialize(); s3c24xx_serial_initialize(); -#if defined(CONFIG_S5P) - serial_register(&s5p_serial0_device); - serial_register(&s5p_serial1_device); - serial_register(&s5p_serial2_device); - serial_register(&s5p_serial3_device); -#endif + s5p_serial_initialize(); #if defined(CONFIG_MPC512X) #if defined(CONFIG_SYS_PSC1) serial_register(&serial1_device); diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 43cbc4f..3c41242 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -221,3 +221,11 @@ __weak struct serial_device *default_serial_console(void) #error "CONFIG_SERIAL? missing." #endif } + +void s5p_serial_initialize(void) +{ + serial_register(&s5p_serial0_device); + serial_register(&s5p_serial1_device); + serial_register(&s5p_serial2_device); + serial_register(&s5p_serial3_device); +} diff --git a/include/serial.h b/include/serial.h index 8eff282..773eace 100644 --- a/include/serial.h +++ b/include/serial.h @@ -57,13 +57,6 @@ extern struct serial_device uartlite_serial2_device; extern struct serial_device uartlite_serial3_device; #endif -#if defined(CONFIG_S5P) -extern struct serial_device s5p_serial0_device; -extern struct serial_device s5p_serial1_device; -extern struct serial_device s5p_serial2_device; -extern struct serial_device s5p_serial3_device; -#endif - #if defined(CONFIG_OMAP3_ZOOM2) extern struct serial_device zoom2_serial_device0; extern struct serial_device zoom2_serial_device1;