From patchwork Mon Jun 24 11:17:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Shinde X-Patchwork-Id: 18064 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 76EEF25DEA for ; Mon, 24 Jun 2013 11:18:33 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id u12sf14924539qcx.8 for ; Mon, 24 Jun 2013 04:18:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:x-auditid:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-brightmail-tracker:x-brightmail-tracker :dlp-filter:x-mtr:x-cfilter-loop:x-gm-message-state :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-google-group-id:list-post:list-help :list-archive:list-unsubscribe; bh=/gR62+/MsHKUWxO8zoXNNJ+fp3adTxv3kDvvfg+zUwE=; b=YLR4BkL4/JXuyZ1r7GcK08ftS2R94Xgic+j4/g5T5RLnNbTGwaCowkn207J3ZgpaAH bdEk/gRodTLzqUze7n1XDmd57cv3KV/dhD7jGwrR5UYlZczvF0BjSvPCB+EIOW/3iOUB +4qPCm/z6TVOv28u091ds9+Qkshb0PPG4Fpb9ytn/AmJXWErZp3dnzoGhI/8vQNKNC9D HShk2MqdM+wLmeX9Nwxxt0GWBiNLLIBv0qeGfd4c3W3qcHFLs0qroZNiWBJTSUTOB7GE RSa8J493r3LxdbZScYKLbIQxhIGaqaYvYzKqzgGy/6gBN8qkzxoIJqSYoZp9QpKcy/sA wb8Q== X-Received: by 10.236.111.40 with SMTP id v28mr13402301yhg.27.1372072713277; Mon, 24 Jun 2013 04:18:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.13.168 with SMTP id i8ls1607502qec.65.gmail; Mon, 24 Jun 2013 04:18:33 -0700 (PDT) X-Received: by 10.58.128.71 with SMTP id nm7mr2278359veb.51.1372072713142; Mon, 24 Jun 2013 04:18:33 -0700 (PDT) Received: from mail-vc0-x236.google.com (mail-vc0-x236.google.com [2607:f8b0:400c:c03::236]) by mx.google.com with ESMTPS id tn5si4746999vdc.52.2013.06.24.04.18.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Jun 2013 04:18:32 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::236; Received: by mail-vc0-f182.google.com with SMTP id id13so331639vcb.27 for ; Mon, 24 Jun 2013 04:18:32 -0700 (PDT) X-Received: by 10.58.29.228 with SMTP id n4mr1957veh.50.1372072712798; Mon, 24 Jun 2013 04:18:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp23136veb; Mon, 24 Jun 2013 04:18:31 -0700 (PDT) X-Received: by 10.66.91.107 with SMTP id cd11mr26946898pab.74.1372072711538; Mon, 24 Jun 2013 04:18:31 -0700 (PDT) Received: from mailout3.samsung.com (mailout3.samsung.com. [203.254.224.33]) by mx.google.com with ESMTP id az2si8921047pab.143.2013.06.24.04.18.30 for ; Mon, 24 Jun 2013 04:18:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.33 as permitted sender) client-ip=203.254.224.33; Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOW00KMHA2PPB60@mailout3.samsung.com> for patches@linaro.org; Mon, 24 Jun 2013 20:18:30 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 52.27.08825.50B28C15; Mon, 24 Jun 2013 20:18:30 +0900 (KST) X-AuditID: cbfee68e-b7f276d000002279-84-51c82b056b68 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id EE.2A.21068.50B28C15; Mon, 24 Jun 2013 20:18:29 +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 <0MOW00ABE9YVU550@mmp2.samsung.com>; Mon, 24 Jun 2013 20:18:29 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, u-boot-review@google.com Subject: [PATCH 3/4 V7] S5P: Serial: Add fdt support to driver Date: Mon, 24 Jun 2013 16:47:22 +0530 Message-id: <1372072643-1402-4-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1372072643-1402-1-git-send-email-rajeshwari.s@samsung.com> References: <1372072643-1402-1-git-send-email-rajeshwari.s@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFLMWRmVeSWpSXmKPExsWyRsSkRpdN+0Sgway1bBYdR1oYLaYc/sJi 8W3LNkaL5a83slu83dvJ7sDqMbvhIovHgk2lHneu7WHzOHtnB6NH35ZVjAGsUVw2Kak5mWWp Rfp2CVwZR5oXsBZMUat4veIgUwPjS7kuRk4OCQETidXNM9kgbDGJC/fWA9lcHEICSxklplxt ZoUp2vnjJzOILSQwnVHi2kkHiKKJTBJPtt5kBEmwCRhJbD05DcwWEZCQ+NV/FcxmFoiS+N59 iR3EFhawk7jw8g/YUBYBVYkVqw+ygNi8Au4S81a2MUEsU5A4NvUrUA0HB6eAh8S0DfIQe90l Xv14wQJR0s0uMXWWI8QYAYlvkw+xgJRLCMhKbDrADFEiKXFwxQ2WCYzCCxgZVjGKphYkFxQn pRcZ6RUn5haX5qXrJefnbmIEhvPpf8/6djDePGB9iDEZaNxEZinR5HxgPOSVxBsamxlZmJqY GhuZW5qRJqwkzqvWYh0oJJCeWJKanZpakFoUX1Sak1p8iJGJg1OqgdHp9SzJiZI6ikVzZoQ9 v2f1l+P0U14r79N5Hptv2vJlrNfed648PD1hW+bdcLbY16t4JDZ8k3v0jqn16TXhi9duux05 4P7mxMR59k//zVlbIblgceA3vv5Hu24WZDaFnq7a4X5ed32O7mqPyFaD12ue/r1ybX3YkSTR fnkujujGko0Oytu0lQ8rsRRnJBpqMRcVJwIAfanD5n0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRmVeSWpSXmKPExsVy+t9jQV1W7ROBBrumWFl0HGlhtJhy+AuL xbct2xgtlr/eyG7xdm8nuwOrx+yGiyweCzaVety5tofN4+ydHYwefVtWMQawRjUw2mSkJqak Fimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVdSKEvMKQUKBSQW Fyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYwZhxpXsBaMEWt4vWKg0wNjC/luhg5OSQETCR2 /vjJDGGLSVy4t54NxBYSmM4oce2kQxcjF5A9kUniydabjCAJNgEjia0np4HZIgISEr/6r4LZ zAJREt+7L7GD2MICdhIXXv5hBbFZBFQlVqw+yAJi8wq4S8xb2cYEsUxB4tjUr0A1HBycAh4S 0zbIQ+x1l3j14wXLBEbeBYwMqxhFUwuSC4qT0nON9IoTc4tL89L1kvNzNzGC4+WZ9A7GVQ0W hxgFOBiVeHgXmB8PFGJNLCuuzD3EKMHBrCTCGypyIlCINyWxsiq1KD++qDQntfgQYzLQUROZ pUST84GxnFcSb2hsYm5qbGppYmFiZkmasJI478FW60AhgfTEktTs1NSC1CKYLUwcnFINjLEm XXdDWdY3xYZWHb92MkPE6eMGZt32NN73j+rWsTY6bj3/l7k+dmXAKZX2d8fLhadqdT2dIdnR lCsqKvO3+UP2ybUS2vkGZbbbJ1w1+TZRr/riob0zvgVI/K3Qajau2vnu5WQuiSt8zsFMKp26 W5V9P01vuCEpom5xUEV8k/vk+/1/zFl/KbEUZyQaajEXFScCAOfq5DTbAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQkHjgbLgbZ4qzJzePszSjL2nwziOoDX/5OXzuVJf/4mrRpeP9ULJfkwpi8QaEeXHqoqxdtl X-Original-Sender: rajeshwari.s@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Chnages in V7: - None. 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)