From patchwork Tue Jun 21 13:55:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2124 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 525CD23F4E for ; Tue, 21 Jun 2011 13:45:54 +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 ED79AA187F6 for ; Tue, 21 Jun 2011 13:45:53 +0000 (UTC) Received: by vxd7 with SMTP id 7so3537470vxd.11 for ; Tue, 21 Jun 2011 06:45:53 -0700 (PDT) Received: by 10.52.168.65 with SMTP id zu1mr4882652vdb.207.1308663953435; Tue, 21 Jun 2011 06:45:53 -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 em2cs67951vdc; Tue, 21 Jun 2011 06:45:52 -0700 (PDT) Received: by 10.14.100.16 with SMTP id y16mr409151eef.22.1308663951482; Tue, 21 Jun 2011 06:45:51 -0700 (PDT) Received: from AM1EHSOBE005.bigfish.com (am1ehsobe005.messaging.microsoft.com [213.199.154.208]) by mx.google.com with ESMTPS id w20si932006eea.16.2011.06.21.06.45.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2011 06:45:50 -0700 (PDT) Received-SPF: neutral (google.com: 213.199.154.208 is neither permitted nor denied by best guess record for domain of r65073@freescale.com) client-ip=213.199.154.208; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.154.208 is neither permitted nor denied by best guess record for domain of r65073@freescale.com) smtp.mail=r65073@freescale.com Received: from mail113-am1-R.bigfish.com (10.3.201.249) by AM1EHSOBE005.bigfish.com (10.3.204.25) with Microsoft SMTP Server id 14.1.225.22; Tue, 21 Jun 2011 13:45:49 +0000 Received: from mail113-am1 (localhost.localdomain [127.0.0.1]) by mail113-am1-R.bigfish.com (Postfix) with ESMTP id 4BC71C40276; Tue, 21 Jun 2011 13:45:49 +0000 (UTC) X-SpamScore: -15 X-BigFish: VS-15(zz179dN1432N98dKzz1202hzzz2dh2a8h668h839h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail113-am1 (localhost.localdomain [127.0.0.1]) by mail113-am1 (MessageSwitch) id 1308663948948167_30116; Tue, 21 Jun 2011 13:45:48 +0000 (UTC) Received: from AM1EHSMHS015.bigfish.com (unknown [10.3.201.242]) by mail113-am1.bigfish.com (Postfix) with ESMTP id D9B24130804E; Tue, 21 Jun 2011 13:45:48 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS015.bigfish.com (10.3.207.153) with Microsoft SMTP Server (TLS) id 14.1.225.22; Tue, 21 Jun 2011 13:45:47 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Tue, 21 Jun 2011 08:45:46 -0500 Received: from S2101-09.ap.freescale.net (vpn-10-213-160-98.am.freescale.net [10.213.160.98]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p5LDjesp007356; Tue, 21 Jun 2011 08:45:41 -0500 (CDT) Date: Tue, 21 Jun 2011 21:55:59 +0800 From: Shawn Guo To: Grant Likely CC: , , , Jason Liu , , Jeremy Kerr , Sascha Hauer , Subject: Re: [PATCH 1/3] serial/imx: add device tree support Message-ID: <20110621135558.GB9228@S2101-09.ap.freescale.net> References: <1308410354-21387-1-git-send-email-shawn.guo@linaro.org> <1308410354-21387-2-git-send-email-shawn.guo@linaro.org> <20110618161934.GH8195@ponder.secretlab.ca> <20110619073000.GA23171@S2100-06.ap.freescale.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110619073000.GA23171@S2100-06.ap.freescale.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com Hi Grant, I just gave a try to use aliases node for identify the device index. Please take a look and let me know if it's what you expect. On Sun, Jun 19, 2011 at 03:30:02PM +0800, Shawn Guo wrote: [...] > > > > > > +#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; > > > > Hmmm, I really would like to be rid of this. Instead, if uarts must > > be enumerated, the driver should look for a /aliases/uart* property > > that matches the of_node. Doing it that way is already established in > > the OpenFirmware documentation, and it ensures there are no overlaps > > in the global namespace. > > > > I just gave one more try to avoid using 'aliases', and you gave a > 'no' again. Now, I know how hard you are on this. Okay, I start > thinking about your suggestion seriously :) > > > We do need some infrastructure to make that easier though. Would you > > have time to help put that together? > > > Ok, I will give it a try. > diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index da0381a..f4a5c3c 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -18,6 +18,12 @@ compatible = "fsl,imx51-babbage", "fsl,imx51"; interrupt-parent = <&tzic>; + aliases { + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + }; + chosen { bootargs = "console=ttymxc0,115200 root=/dev/mmcblk0p3 rootwait"; }; @@ -47,29 +53,29 @@ reg = <0x70000000 0x40000>; ranges; - uart@7000c000 { + uart2: uart@7000c000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x7000c000 0x4000>; interrupts = <33>; id = <3>; - fsl,has-rts-cts; + fsl,uart-has-rtscts; }; }; - uart@73fbc000 { + uart0: uart@73fbc000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x73fbc000 0x4000>; interrupts = <31>; id = <1>; - fsl,has-rts-cts; + fsl,uart-has-rtscts; }; - uart@73fc0000 { + uart1: uart@73fc0000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x73fc0000 0x4000>; interrupts = <32>; id = <2>; - fsl,has-rts-cts; + fsl,uart-has-rtscts; }; }; diff --git a/drivers/of/base.c b/drivers/of/base.c index 632ebae..13df5d2 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -737,6 +737,37 @@ err0: EXPORT_SYMBOL(of_parse_phandles_with_args); /** + * of_get_device_index - Get device index by looking up "aliases" node + * @np: Pointer to device node that asks for device index + * @name: The device alias without index number + * + * Returns the device index if find it, else returns -ENODEV. + */ +int of_get_device_index(struct device_node *np, const char *alias) +{ + struct device_node *aliases = of_find_node_by_name(NULL, "aliases"); + struct property *prop; + char name[32]; + int index = 0; + + if (!aliases) + return -ENODEV; + + while (1) { + snprintf(name, sizeof(name), "%s%d", alias, index); + prop = of_find_property(aliases, name, NULL); + if (!prop) + return -ENODEV; + if (np == of_find_node_by_path(prop->value)) + break; + index++; + } + + return index; +} +EXPORT_SYMBOL(of_get_device_index); + +/** * prom_add_property - Add a property to a node */ int prom_add_property(struct device_node *np, struct property *prop) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index da436e0..852668f 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1271,18 +1271,18 @@ static int serial_imx_probe_dt(struct imx_port *sport, struct device_node *node = pdev->dev.of_node; const struct of_device_id *of_id = of_match_device(imx_uart_dt_ids, &pdev->dev); - const __be32 *line; + int line; if (!node) return -ENODEV; - line = of_get_property(node, "id", NULL); - if (!line) + line = of_get_device_index(node, "serial"); + if (IS_ERR_VALUE(line)) return -ENODEV; - sport->port.line = be32_to_cpup(line) - 1; + sport->port.line = line; - if (of_get_property(node, "fsl,has-rts-cts", NULL)) + if (of_get_property(node, "fsl,uart-has-rtscts", NULL)) sport->have_rtscts = 1; if (of_get_property(node, "fsl,irda-mode", NULL)) diff --git a/include/linux/of.h b/include/linux/of.h index bfc0ed1..3153752 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -213,6 +213,8 @@ extern int of_parse_phandles_with_args(struct device_node *np, const char *list_name, const char *cells_name, int index, struct device_node **out_node, const void **out_args); +extern int of_get_device_index(struct device_node *np, const char *alias); + extern int of_machine_is_compatible(const char *compat); extern int prom_add_property(struct device_node* np, struct property* prop);