From patchwork Tue Nov 27 12:45:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 10700525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 797DC14D6 for ; Tue, 27 Nov 2018 13:33:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 693A42B312 for ; Tue, 27 Nov 2018 13:33:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53C712B33D; Tue, 27 Nov 2018 13:33:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD3A52B2EF for ; Tue, 27 Nov 2018 13:33:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6YFtD08KFbtSMzMG8sY/mdubvJlCuA/g5UKrVTNpcU0=; b=gbPuj8pOKhSe7F 5VmCsTXOurQ3xPR3SNvkZeNNtMtBQqwSlxkAhvUmb/5OPfLIqzc+ojpx1c3BDlINC9ZUjBoQ7n/+q ZNPfok24FxUDs06oiLQCYM7IPdZmtwOy+cKtRedPFfXCyshYjNiVHcZW7qcXoWCTZBS4vvcW5w4TP 3dPWX7/zOEoOIdnPG+o0dfIzEz986fK0WRnJjRfI13jul0NoYB3T9WlLthrI1DTc3pt3QtdBOjW9H sHVYsB25k2L1xomRo8bELBKRRJvfhvLsgh5/8zgFcPBOsabbKQVDrNTeCdTgdqDOIeQcxUgEoruMJ Pf7n1GVUmHbIgn5i9PnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRdU8-0001Or-3n; Tue, 27 Nov 2018 13:33:04 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRdSl-000863-2N for linux-arm-kernel@bombadil.infradead.org; Tue, 27 Nov 2018 13:31:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=deppMyDlf2KIFgS/DEcx6pLmxQxPjJ8Y/GT2rT3VBO4=; b=KJqens2VMtszvM7kiXMWHLJkYF el+Eh1yhtvr9abj+lB8Se/eYoV9Qk4MZ7vj6TCC7dbq8dJfErsJtsudqNesIGZVmDuWZHTgYZzfSO sP+c1IzUS/Y4/4MoOKVGsW8OSJYk50ZSCwC/NRY3UrFBA7ucSBOj7HGx3KqM7JcYHRAWxOAJWBlVe yYY+ncve18hkVO1Et/yGRc3qwLzkpH3uJgKhylEJMVkU3XiPmwrKKZKNa/xW+z9SR8aQ3wyUuDvFm XBszWz0MTk1o3ctlXg3yib1dqOZiFJIbgv8akpFhiZ7FrJ7Nd2nalOuwyADpRTDoqlRkZXhl2Fq+Z IsI9magg==; Received: from mail.bootlin.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRcls-00020R-Th for linux-arm-kernel@lists.infradead.org; Tue, 27 Nov 2018 12:47:21 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id AB45320DEB; Tue, 27 Nov 2018 13:47:07 +0100 (CET) Received: from localhost (aaubervilliers-681-1-94-205.w90-88.abo.wanadoo.fr [90.88.35.205]) by mail.bootlin.com (Postfix) with ESMTPSA id A360420DF3; Tue, 27 Nov 2018 13:46:40 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard Subject: [PATCH 44/77] ARM: dts: sun7i: Split the RTS and CTS pins out of the UART nodes Date: Tue, 27 Nov 2018 13:45:45 +0100 Message-Id: <998922bf617df5eff6c6f19b97d7778ad9668eb4.1543321707.git-series.maxime.ripard@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181127_074721_073243_89733A21 X-CRM114-Status: GOOD ( 11.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some UART nodes on the A20 DTSI do not share the same pattern that we use everywhere else, with the RTS and CTS pins split away from the TX and RX pins. Make those pin groups consistent with the rest of our DT. Signed-off-by: Maxime Ripard Acked-by: Chen-Yu Tsai --- arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 4 ++-- arch/arm/boot/dts/sun7i-a20-mk808c.dts | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts index 9ce59d49cf49..a1af7d6726e2 100644 --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts @@ -215,13 +215,13 @@ &uart2 { pinctrl-names = "default"; - pinctrl-0 = <&uart2_pi_pins>; + pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>; status = "okay"; }; &uart3 { pinctrl-names = "default"; - pinctrl-0 = <&uart3_pg_pins>; + pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun7i-a20-mk808c.dts b/arch/arm/boot/dts/sun7i-a20-mk808c.dts index a8d15d01ac1a..b4143a91086b 100644 --- a/arch/arm/boot/dts/sun7i-a20-mk808c.dts +++ b/arch/arm/boot/dts/sun7i-a20-mk808c.dts @@ -173,7 +173,7 @@ &uart2 { pinctrl-names = "default"; - pinctrl-0 = <&uart2_pi_pins>; + pinctrl-0 = <&uart2_pi_pins>, <&uart2_cts_rts_pi_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 75669fc51de5..bffd3a21bee3 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -935,12 +935,22 @@ }; uart2_pi_pins: uart2-pi-pins { - pins = "PI16", "PI17", "PI18", "PI19"; + pins = "PI18", "PI19"; + function = "uart2"; + }; + + uart2_cts_rts_pi_pins: uart2-cts-rts-pi-pins { + pins = "PI16", "PI17"; function = "uart2"; }; uart3_pg_pins: uart3-pg-pins { - pins = "PG6", "PG7", "PG8", "PG9"; + pins = "PG6", "PG7"; + function = "uart3"; + }; + + uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins { + pins = "PG8", "PG9"; function = "uart3"; };