From patchwork Wed Feb 27 06:01:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 223505 X-Patchwork-Delegate: promsoft@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 5BF542C0040 for ; Wed, 27 Feb 2013 16:55:25 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8D9004A03E; Wed, 27 Feb 2013 06:55:18 +0100 (CET) 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 tDP5FIKwh1nI; Wed, 27 Feb 2013 06:55:18 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F15834A03C; Wed, 27 Feb 2013 06:54:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E29654A028 for ; Wed, 27 Feb 2013 06:54:42 +0100 (CET) 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 eA2Z0Iw-fXOF for ; Wed, 27 Feb 2013 06:54:41 +0100 (CET) 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 mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by theia.denx.de (Postfix) with ESMTP id 4518C4A023 for ; Wed, 27 Feb 2013 06:54:39 +0100 (CET) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MIV00KIX72UDYH0@mailout2.samsung.com> for u-boot@lists.denx.de; Wed, 27 Feb 2013 14:54:32 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.126]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 43.70.25214.79F9D215; Wed, 27 Feb 2013 14:54:32 +0900 (KST) X-AuditID: cbfee68e-b7fa46d00000627e-94-512d9f970803 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B3.3F.03880.79F9D215; Wed, 27 Feb 2013 14:54:31 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MIV00KG172NXA10@mmp1.samsung.com> for u-boot@lists.denx.de; Wed, 27 Feb 2013 14:54:31 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Wed, 27 Feb 2013 11:31:58 +0530 Message-id: <1361944919-13384-4-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1361944919-13384-1-git-send-email-rajeshwari.s@samsung.com> References: <1361944919-13384-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGLMWRmVeSWpSXmKPExsWyRsSkTnfGfN1Ag6UrWCze7u1kd2D0OHtn B2MAYxSXTUpqTmZZapG+XQJXRlvTRcaCDtWKj5v2MTYwrpTrYuTkkBAwkejd+IgRwhaTuHBv PVsXIxeHkMBSRonlXRuZYYqerLjHDJFYxCgx7+Q6VghnFZPEymnL2EGq2ASMJLaenAY2SkRA QuJX/1Uwm1kgRuL1/h9sILawgLXE4T0NYFNZBFQl9qz5xARi8wp4SLzZuRxqm4LEsalfWUFs TgFPiaNPl4DNFwKqmXj9CQvIYgmBy2wSx688Z4IYJCDxbfIhoAQHUEJWYtMBqDmSEgdX3GCZ wCi8gJFhFaNoakFyQXFSepGRXnFibnFpXrpecn7uJkZgGJ7+96xvB+PNA9aHGJOBxk1klhJN zgeGcV5JvKGxibmpsamZkaWlpSlpwkrivPKXZAKFBNITS1KzU1MLUovii0pzUosPMTJxcEo1 MM6MDnXzSSze07RsWjKXycbFP2Lniea+rYg/b64inOT69tjZ4JdZz54+Keeca8tkeTB9Wv2j E7unF+736VZ47XXh/7ovt5c/k3zT1Fm5RGX6LWn5/NftZst3rinxnPjpxgtu/88bTnf/uHil vjplxeyFom8cjGNu9y+Ii8+P/FTzpWlfZ1rtyv9KLMUZiYZazEXFiQDJOaNkWQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jAd3p83UDDS52mVm83dvJ7sDocfbO DsYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxoy2pouMBR2qFR837WNs YFwp18XIySEhYCLxZMU9ZghbTOLCvfVsXYxcHEICixgl5p1cxwrhrGKSWDltGTtIFZuAkcTW k9MYQWwRAQmJX/1XwWxmgRiJ1/t/sIHYwgLWEof3NIBNZRFQldiz5hMTiM0r4CHxZudyqG0K EsemfmUFsTkFPCWOPl0CNl8IqGbi9ScsExh5FzAyrGIUTS1ILihOSs810itOzC0uzUvXS87P 3cQIDvJn0jsYVzVYHGIU4GBU4uFdcEknUIg1say4MvcQowQHs5II78cDQCHelMTKqtSi/Pii 0pzU4kOMyUBXTWSWEk3OB0ZgXkm8obGJuamxqaWJhYmZJWnCSuK8jKeeBAgJpCeWpGanphak FsFsYeLglGpg9Ps4f8H9tEm+Mbucn8xee115uofeJ5u1m89vXuJxyv/thcr8feuW8kaLS1n/ TbvV77vkSd7z0NCM93kurk9Oby7zN3AVceLIvu/g2VJjEqltrnzvwsE5laKe+w9VMnz9cIG/ zPtW15no+qcLJicwRib35lZeYDIU+pmx+vC++Rw+m7T5osp4lViKMxINtZiLihMBNnQ34LYC AAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: patches@linaro.org Subject: [U-Boot] [PATCH 3/4] S5P: Serial: Add fdt support to 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 This patch adds FDT support to the serial s5p driver. At present disabling the serial console (from the device tree) crashes U-Boot. Add checks for this case, so that execution can continue without a serial console. It also enables the serial_s5p driver recognize the silent_console option. Signed-off-by: Abhilash Kesavan Signed-off-by: Gabe Black Signed-off-by: Simon Glass Signed-off-by: Rajeshwari Shinde Acked-by: Simon Glass --- drivers/serial/serial_s5p.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index 3c41242..4502ffb 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -24,16 +24,30 @@ #include #include #include +#include #include #include #include DECLARE_GLOBAL_DATA_PTR; +/* Information about a serial port */ +struct fdt_serial { + u32 base_addr; /* address of registers in physical memory */ + u8 port_id; /* uart port number */ + u8 enabled; /* 1 if enabled, 0 if disabled */ +} config = { + -1U +}; + static inline struct s5p_uart *s5p_get_base_uart(int dev_index) { +#ifdef CONFIG_OF_CONTROL + return (struct s5p_uart *)(config.base_addr); +#else u32 offset = dev_index * sizeof(struct s5p_uart); return (struct s5p_uart *)(samsung_get_base_uart() + offset); +#endif } /* @@ -69,6 +83,9 @@ void serial_setbrg_dev(const int dev_index) u32 baudrate = gd->baudrate; u32 val; + if (!config.enabled) + return; + val = uclk / baudrate; writel(val / 16 - 1, &uart->ubrdiv); @@ -87,6 +104,16 @@ int serial_init_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index); +#if defined(CONFIG_SILENT_CONSOLE) && \ + defined(CONFIG_OF_CONTROL) && \ + !defined(CONFIG_SPL_BUILD) + if (fdtdec_get_config_int(gd->fdt_blob, "silent_console", 0)) + gd->flags |= GD_FLG_SILENT; +#endif + + if (!config.enabled) + return 0; + /* reset and enable FIFOs, set triggers to the maximum */ writel(0, &uart->ufcon); writel(0, &uart->umcon); @@ -129,6 +156,9 @@ int serial_getc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index); + if (!config.enabled) + return 0; + /* wait for character to arrive */ while (!(readl(&uart->utrstat) & 0x1)) { if (serial_err_check(dev_index, 0)) @@ -145,6 +175,9 @@ void serial_putc_dev(const char c, const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index); + if (!config.enabled) + return; + /* wait for room in the tx FIFO */ while (!(readl(&uart->utrstat) & 0x2)) { if (serial_err_check(dev_index, 1)) @@ -165,6 +198,9 @@ int serial_tstc_dev(const int dev_index) { struct s5p_uart *const uart = s5p_get_base_uart(dev_index); + if (!config.enabled) + return 0; + return (int)(readl(&uart->utrstat) & 0x1); } @@ -207,8 +243,51 @@ DECLARE_S5P_SERIAL_FUNCTIONS(3); struct serial_device s5p_serial3_device = INIT_S5P_SERIAL_STRUCTURE(3, "s5pser3"); +#ifdef CONFIG_OF_CONTROL +int fdtdec_decode_console(int *index, struct fdt_serial *uart) +{ + const void *blob = gd->fdt_blob; + int node; + + node = fdtdec_next_alias(blob, "serial", COMPAT_SAMSUNG_EXYNOS5_SERIAL, + index); + if (node < 0) + return node; + + uart->base_addr = fdtdec_get_addr(blob, node, "reg"); + if (uart->base_addr == FDT_ADDR_T_NONE) + return -FDT_ERR_NOTFOUND; + + uart->port_id = fdtdec_get_int(blob, node, "id", -1); + uart->enabled = fdtdec_get_is_enabled(blob, node); + + return 0; +} +#endif + __weak struct serial_device *default_serial_console(void) { +#ifdef CONFIG_OF_CONTROL + int index = 0; + if (fdtdec_decode_console(&index, &config)) { + debug("Cannot decode default console node\n"); + return NULL; + } + + if (config.port_id == 0) + return &s5p_serial0_device; + else if (config.port_id == 1) + return &s5p_serial1_device; + else if (config.port_id == 2) + return &s5p_serial2_device; + else if (config.port_id == 3) + return &s5p_serial3_device; + else + debug("Unknown config.port_id: %d", config.port_id); + + return NULL; +#else + config.enabled = 1; #if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -220,6 +299,7 @@ __weak struct serial_device *default_serial_console(void) #else #error "CONFIG_SERIAL? missing." #endif +#endif } void s5p_serial_initialize(void)