From patchwork Fri Nov 14 22:07:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 5309771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B9C1CC11AC for ; Fri, 14 Nov 2014 22:09:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6286720145 for ; Fri, 14 Nov 2014 22:09:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7AC7120142 for ; Fri, 14 Nov 2014 22:09:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XpP1q-0001PD-Oz; Fri, 14 Nov 2014 22:07:42 +0000 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XpP1o-0001Jr-Fk for linux-arm-kernel@lists.infradead.org; Fri, 14 Nov 2014 22:07:41 +0000 Received: by mail-pa0-f44.google.com with SMTP id et14so3564043pad.31 for ; Fri, 14 Nov 2014 14:07:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=eSEA2XlhX/m1TaULyHzzgxEaA04GFS/A70LuRfFKBn8=; b=DuMTb4nz2VgAGDQmWwOv7w+oXK9s6pD4TYoJQWON52oHT/2VHo7o30QtGIJ/Vb80AC TO8uFw827xUO7Q0zLrU7C4huLIc2hXJ06QlSoK0Oh/Kdhw5eIYiP/xX4sRq+Su53jrx7 YPFFaRLu4Ubud31k7QHl5zO5Y2n7839/b0KQBEiabh4EpSLCCseHI312H4E4vO/0lZTo oTymAULeXYXUK+Z4ehVMvXnk5KGedzKRhz+Mtk3bVnWSelyV4ooMUWm+uhyCz2RiyRka huLGWDAFIgQEWJf2fOc3h1ZEdyz3rKQ4BGRA27eTHuCwAddEc4QxUbkoA7dtCanB6D0I MhRQ== X-Received: by 10.68.108.36 with SMTP id hh4mr13253111pbb.108.1416002839482; Fri, 14 Nov 2014 14:07:19 -0800 (PST) Received: from [192.168.1.62] (c-67-170-214-152.hsd1.ca.comcast.net. [67.170.214.152]) by mx.google.com with ESMTPSA id d6sm11201285pdn.40.2014.11.14.14.07.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Nov 2014 14:07:18 -0800 (PST) Message-ID: <54667D13.2070105@gmail.com> Date: Fri, 14 Nov 2014 14:07:15 -0800 From: Frank Rowand User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Greg Kroah-Hartman , Stephen Boyd Subject: [PATCH] tty: serial: msm_serial: document DT alias X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141114_140740_552024_70D7CD6A X-CRM114-Status: GOOD ( 10.20 ) X-Spam-Score: -0.8 (/) Cc: "devicetree@vger.kernel.org" , Arnd Bergmann , Kevin Hilman , "linux-arm-msm@vger.kernel.org" , Tyler Baker , Linux Kernel list , linux-serial@vger.kernel.org, Olof Johansson , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: frowand.list@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Frank Rowand Update devicetree binding for msm_serial to reflect msm_serial_probe() getting line id (port number) from the serialN alias. Signed-off-by: Frank Rowand --- Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt | 15 +++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) Index: linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt =================================================================== --- linux.orig/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt +++ linux/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt @@ -27,27 +27,52 @@ Optional properties: - dmas: Should contain dma specifiers for transmit and receive channels - dma-names: Should contain "tx" for transmit and "rx" for receive channels +Note: Aliases may be defined to ensure the correct ordering of the UARTs. +The alias serialN will result in the UART being assigned port N. If any +serialN alias exists, then an alias must exist for each enabled UART. The +serialN aliases should be in a .dts file instead of in a .dtsi file. + Examples: -A uartdm v1.4 device with dma capabilities. +- A uartdm v1.4 device with dma capabilities. + + serial@f991e000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0xf991e000 0x1000>; + interrupts = <0 108 0x0>; + clocks = <&blsp1_uart2_apps_cxc>, <&blsp1_ahb_cxc>; + clock-names = "core", "iface"; + dmas = <&dma0 0>, <&dma0 1>; + dma-names = "tx", "rx"; + }; + +- A uartdm v1.3 device without dma capabilities and part of a GSBI complex. + + serial@19c40000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x19c40000 0x1000>, + <0x19c00000 0x1000>; + interrupts = <0 195 0x0>; + clocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>; + clock-names = "core", "iface"; + }; + +- serialN alias. + + aliases { + serial0 = &uarta; + serial1 = &uartc; + serial2 = &uartb; + }; + + uarta: serial@12490000 { + status = "ok"; + }; + + uartb: serial@16340000 { + status = "ok"; + }; -serial@f991e000 { - compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; - reg = <0xf991e000 0x1000>; - interrupts = <0 108 0x0>; - clocks = <&blsp1_uart2_apps_cxc>, <&blsp1_ahb_cxc>; - clock-names = "core", "iface"; - dmas = <&dma0 0>, <&dma0 1>; - dma-names = "tx", "rx"; -}; - -A uartdm v1.3 device without dma capabilities and part of a GSBI complex. - -serial@19c40000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x19c40000 0x1000>, - <0x19c00000 0x1000>; - interrupts = <0 195 0x0>; - clocks = <&gsbi5_uart_cxc>, <&gsbi5_ahb_cxc>; - clock-names = "core", "iface"; -}; + uartc: serial@1a240000 { + status = "ok"; + };