From patchwork Sat Jun 18 15:19:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2039 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6A88623E54 for ; Sat, 18 Jun 2011 15:10:12 +0000 (UTC) Received: from mail-vx0-f180.google.com (mail-vx0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2295CA185F4 for ; Sat, 18 Jun 2011 15:10:12 +0000 (UTC) Received: by vxd7 with SMTP id 7so1269013vxd.11 for ; Sat, 18 Jun 2011 08:10:11 -0700 (PDT) Received: by 10.52.162.72 with SMTP id xy8mr4800221vdb.87.1308409811360; Sat, 18 Jun 2011 08:10:11 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.52.183.130 with SMTP id em2cs26173vdc; Sat, 18 Jun 2011 08:10:11 -0700 (PDT) Received: by 10.42.178.195 with SMTP id bn3mr2975477icb.504.1308409810551; Sat, 18 Jun 2011 08:10:10 -0700 (PDT) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id v5si4556843icj.154.2011.06.18.08.10.09 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 18 Jun 2011 08:10:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by iyb26 with SMTP id 26so2381474iyb.37 for ; Sat, 18 Jun 2011 08:10:09 -0700 (PDT) Received: by 10.42.224.136 with SMTP id io8mr3722316icb.376.1308409808462; Sat, 18 Jun 2011 08:10:08 -0700 (PDT) Received: from localhost.localdomain ([114.216.149.215]) by mx.google.com with ESMTPS id s2sm3709438icw.5.2011.06.18.08.09.58 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 18 Jun 2011 08:10:07 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, patches@linaro.org, Shawn Guo , Jeremy Kerr , Jason Liu , Sascha Hauer Subject: [PATCH 1/3] serial/imx: add device tree support Date: Sat, 18 Jun 2011 23:19:12 +0800 Message-Id: <1308410354-21387-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1308410354-21387-1-git-send-email-shawn.guo@linaro.org> References: <1308410354-21387-1-git-send-email-shawn.guo@linaro.org> It adds device tree data parsing support for imx tty/serial driver. Signed-off-by: Jeremy Kerr Signed-off-by: Jason Liu Signed-off-by: Shawn Guo Cc: Sascha Hauer --- .../bindings/tty/serial/fsl-imx-uart.txt | 21 +++++ drivers/tty/serial/imx.c | 81 +++++++++++++++++--- 2 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt new file mode 100644 index 0000000..7648e17 --- /dev/null +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt @@ -0,0 +1,21 @@ +* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART) + +Required properties: +- compatible : should be "fsl,-uart", "fsl,imx-uart" +- reg : address and length of the register set for the device +- interrupts : should contain uart interrupt +- id : should be the port ID defined by soc + +Optional properties: +- fsl,has-rts-cts : indicate it has rts-cts +- fsl,irda-mode : support irda mode + +Example: + +uart@73fbc000 { + compatible = "fsl,imx51-uart", "fsl,imx-uart"; + reg = <0x73fbc000 0x4000>; + interrupts = <31>; + id = <1>; + fsl,has-rts-cts; +}; diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index a544731..2769353 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -45,6 +45,8 @@ #include #include #include +#include +#include #include #include @@ -1223,6 +1225,63 @@ static int serial_imx_resume(struct platform_device *dev) return 0; } +#ifdef CONFIG_OF +static int serial_imx_probe_dt(struct imx_port *sport, + struct platform_device *pdev) +{ + struct device_node *node = pdev->dev.of_node; + const __be32 *line; + + if (!node) + return -ENODEV; + + line = of_get_property(node, "id", NULL); + if (!line) + return -ENODEV; + + sport->port.line = be32_to_cpup(line) - 1; + + if (of_get_property(node, "fsl,has-rts-cts", NULL)) + sport->have_rtscts = 1; + + if (of_get_property(node, "fsl,irda-mode", NULL)) + sport->use_irda = 1; + + return 0; +} + +static struct of_device_id imx_uart_dt_ids[] = { + { .compatible = "fsl,imx-uart" }, + {}, +}; +#else +static int serial_imx_probe_dt(struct imx_port *sport, + struct platform_device *pdev) +{ + return -ENODEV; +} +#define imx_uart_dt_ids NULL +#endif + +static int serial_imx_probe_pdata(struct imx_port *sport, + struct platform_device *pdev) +{ + struct imxuart_platform_data *pdata = pdev->dev.platform_data; + + if (!pdata) + return 0; + + if (pdata->flags & IMXUART_HAVE_RTSCTS) + sport->have_rtscts = 1; + + if (pdata->flags & IMXUART_IRDA) + sport->use_irda = 1; + + sport->port.line = pdev->id; + + return 0; +} + static int serial_imx_probe(struct platform_device *pdev) { struct imx_port *sport; @@ -1235,6 +1294,12 @@ static int serial_imx_probe(struct platform_device *pdev) if (!sport) return -ENOMEM; + ret = serial_imx_probe_dt(sport, pdev); + if (ret == -ENODEV) + ret = serial_imx_probe_pdata(sport, pdev); + if (ret) + goto free; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { ret = -ENODEV; @@ -1259,7 +1324,6 @@ static int serial_imx_probe(struct platform_device *pdev) sport->port.fifosize = 32; sport->port.ops = &imx_pops; sport->port.flags = UPF_BOOT_AUTOCONF; - sport->port.line = pdev->id; init_timer(&sport->timer); sport->timer.function = imx_timeout; sport->timer.data = (unsigned long)sport; @@ -1273,17 +1337,13 @@ static int serial_imx_probe(struct platform_device *pdev) sport->port.uartclk = clk_get_rate(sport->clk); - imx_ports[pdev->id] = sport; + if (imx_ports[sport->port.line]) { + ret = -EBUSY; + goto clkput; + } + imx_ports[sport->port.line] = sport; pdata = pdev->dev.platform_data; - if (pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) - sport->have_rtscts = 1; - -#ifdef CONFIG_IRDA - if (pdata && (pdata->flags & IMXUART_IRDA)) - sport->use_irda = 1; -#endif - if (pdata && pdata->init) { ret = pdata->init(pdev); if (ret) @@ -1344,6 +1404,7 @@ static struct platform_driver serial_imx_driver = { .driver = { .name = "imx-uart", .owner = THIS_MODULE, + .of_match_table = imx_uart_dt_ids, }, };