From patchwork Mon Jun 24 09:16:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 253756 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 886072C045E for ; Mon, 24 Jun 2013 19:16:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 683254A185; Mon, 24 Jun 2013 11:16:31 +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 l9wPMnDDXgFm; Mon, 24 Jun 2013 11:16:31 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9A8F94A19B; Mon, 24 Jun 2013 11:16:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DEBB44A173 for ; Mon, 24 Jun 2013 11:16:04 +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 27IRCqt3IR16 for ; Mon, 24 Jun 2013 11:15:59 +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 mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 6A2DB4A179 for ; Mon, 24 Jun 2013 11:15:56 +0200 (CEST) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOW00DDQ4DSU150@mailout1.samsung.com> for u-boot@lists.denx.de; Mon, 24 Jun 2013 18:15:47 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.122]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id DC.2E.08825.24E08C15; Mon, 24 Jun 2013 18:15:47 +0900 (KST) X-AuditID: cbfee68e-b7f276d000002279-ee-51c80e429003 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F4.5E.21068.24E08C15; Mon, 24 Jun 2013 18:15:46 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOW002ZC4DX3GD0@mmp2.samsung.com>; Mon, 24 Jun 2013 18:15:46 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Mon, 24 Jun 2013 14:46:48 +0530 Message-id: <1372065409-18412-4-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1372065409-18412-1-git-send-email-rajeshwari.s@samsung.com> References: <1372065409-18412-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsWyRsSkSteZ70SgQdMJRouOIy2MFlMOf2Gx +LZlG6PF8tcb2S3e7u1kd2D1mN1wkcVjwaZSjzvX9rB5nL2zg9Gjb8sqxgDWKC6blNSczLLU In27BK6MZyd2sBb8Uq2Y+Y+7gfG6XBcjJ4eEgIlE79XtzBC2mMSFe+vZuhi5OIQEljJKfFz6 gwmm6OSXBUwQiemMEmferGQHSQgJTGSSeNrPB2KzCRhJbD05jRHEFhGQkPjVfxXMZhaIkvje fQmsXljATmLr7xVgQ1kEVCXuPzrJBmLzCnhI3LnSAbVMQeLY1K+sIDangKfEhxUzmCF2eUhc 3v4P7DoJgW52iTdL7zFDDBKQ+Db5EEsXIwdQQlZi0wGobyQlDq64wTKBUXgBI8MqRtHUguSC 4qT0IiO94sTc4tK8dL3k/NxNjMCAPv3vWd8OxpsHrA8xJgONm8gsJZqcD4yIvJJ4Q2MzIwtT E1NjI3NLM9KElcR51VqsA4UE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUw+uRWRm8zMboh2xq3 yUaoaPf7WiGj9sxux/6Kmx1fOU9nvIsWmW+r8//ss+OqG5422p76+iYtNjz6WfeKu9FKc+a5 FU45VHZT7hD79MW7rsRysgRPmcH0kp8tuMrE9/uTCf+7b/+UtBI8lmDD90RW3M1eQo6P8ZCa QPD/iVdtpu66vze+csVGJZbijERDLeai4kQABHN1pX4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRmVeSWpSXmKPExsVy+t9jQV0nvhOBBtd/mVh0HGlhtJhy+AuL xbct2xgtlr/eyG7xdm8nuwOrx+yGiyweCzaVety5tofN4+ydHYwefVtWMQawRjUw2mSkJqak Fimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVdSKEvMKQUKBSQW Fyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYwZjw7sYO14Jdqxcx/3A2M1+W6GDk5JARMJE5+ WcAEYYtJXLi3nq2LkYtDSGA6o8SZNyvZQRJCAhOZJJ7284HYbAJGEltPTmMEsUUEJCR+9V8F s5kFoiS+d18CqxcWsJPY+nsF2FAWAVWJ+49OsoHYvAIeEneudEAtU5A4NvUrK4jNKeAp8WHF DGaIXR4Sl7f/Y5vAyLuAkWEVo2hqQXJBcVJ6rpFecWJucWleul5yfu4mRnC8PJPewbiqweIQ owAHoxIP7wLz44FCrIllxZW5hxglOJiVRHgPXQEK8aYkVlalFuXHF5XmpBYfYkwGumois5Ro cj4wlvNK4g2NTcxNjU0tTSxMzCxJE1YS5z3Yah0oJJCeWJKanZpakFoEs4WJg1OqgXFL3FmP mujtrq8+LHK0mvy/ub0t7qv7nRBBrtwpyTcrT7RwfP6X5aq4MPiFusOn7ycMFr57WnS07Eds 3QSrcJvYTdxxV01qloQllGXO+ab7+mDV/cMy/9bwp7K57p1Q82/V3VPKkwXFyvLKvG/OMFc6 JauUsaeor+/upFW/OT4xRIgeCd1vfECJpTgj0VCLuag4EQDoGyfx2wIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: u-boot-review@google.com, patches@linaro.org Subject: [U-Boot] [PATCH 3/4 V6] 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 --- Changes in V2: - None Changes in V3: - Moved driver config structure to data section. - Changed silent_console to silent-console. - Did put a check for base address before doing fdt decoding. Changes in V4: - None Changes in V5: - None Changes in V6: - Changed the if..else condition to a switch statement. drivers/serial/serial_s5p.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/drivers/serial/serial_s5p.c b/drivers/serial/serial_s5p.c index e65125c..6836c7a 100644 --- a/drivers/serial/serial_s5p.c +++ b/drivers/serial/serial_s5p.c @@ -22,6 +22,7 @@ */ #include +#include #include #include #include @@ -34,10 +35,21 @@ DECLARE_GLOBAL_DATA_PTR; #define RX_FIFO_FULL_MASK (1 << 8) #define TX_FIFO_FULL_MASK (1 << 24) +/* 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 __attribute__ ((section(".data"))); + 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 } /* @@ -73,6 +85,16 @@ void serial_setbrg_dev(const int dev_index) u32 baudrate = gd->baudrate; u32 val; +#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; + val = uclk / baudrate; writel(val / 16 - 1, &uart->ubrdiv); @@ -133,6 +155,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->ufstat) & (RX_FIFO_COUNT_MASK | RX_FIFO_FULL_MASK))) { @@ -150,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->ufstat) & TX_FIFO_FULL_MASK)) { if (serial_err_check(dev_index, 1)) @@ -170,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); } @@ -212,8 +243,54 @@ 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 = fdt_path_offset(blob, "console"); + 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 ((!config.base_addr) && (fdtdec_decode_console(&index, &config))) { + debug("Cannot decode default console node\n"); + return NULL; + } + + switch (config.port_id) { + case 0: + return &s5p_serial0_device; + case 1: + return &s5p_serial1_device; + case 2: + return &s5p_serial2_device; + case 3: + return &s5p_serial3_device; + default: + debug("Unknown config.port_id: %d", config.port_id); + break; + } + + return NULL; +#else + config.enabled = 1; #if defined(CONFIG_SERIAL0) return &s5p_serial0_device; #elif defined(CONFIG_SERIAL1) @@ -225,6 +302,7 @@ __weak struct serial_device *default_serial_console(void) #else #error "CONFIG_SERIAL? missing." #endif +#endif } void s5p_serial_initialize(void)